If you did a factory reset and you're still having the same issues, then revert back to kitikat.
I did the update to lollipop yesterday and after that battery life took a dump. I did a factory reset with no major improvement. I did some searching around and read that lots of people had major issues with this update.
I decided to go back to kitikat, which I just pretty much finished. Much happier! Plus I hated the look of lollipop.
For the people that want to update to Lollipop...do your homework 1st. You might just find yourself going back to Kitikat.
Good luck!
Sent from my SM-G900P using Tapatalk