Thank you all.
It would be nice if it is the battery, I have 64k miles and still the original one on and I have a bunch of things connected, GPS, Extra Lights, charging things while I'm riding.
It'd piss me off if it is the battery because the mechanic didn't think about it