I finally managed to fix it, I did a factory reset, seemed like the best option as SMS messages stopped working, Various apps crashing..... the list goes on
Seems fine now, battery life still crap, but Lollipop seems ok when I get used to the changes!