Motorola Moto G 4G — Lollipop 5.1 battery woe

I recently upgraded to Lollipop 5.1, since then my phone has developed some unfortunate little quirks it did not have prior to lollipop. One of the worst is that it is very difficult to recharge my battery! What once took just over an hour, now takes several hours. Sometimes the lightning bolt icon is on the screen, but the phone indicates it is not charging despite the icon being present. Have seen the phone going back and forth saying charging, not charging, charging, not charging. Motorola are not much help, and say the fix can only come via Google, who don't seem to be very interested in helping neither. I've checked various blogs, apparently performing full factory reset didn't really help those who went that avenue. That's okay as I don't particularly want to do that. Anyone know how to fix this problem? Thanks for your time. P.S. Found this morning that the camera is also not working!?! Thank you Google for your stupid crappy software, you don't deserve a gem like Android!!!

— modified on Jul 17, 2015, 2:21:52 AM