Factory reset seems to have worked for me. I'm getting 4 plus hours of screen on time and excellent standby. Usually drain maybe a percent an hour if that. It was worth the hassle of a factory reset in my case.
Kewl. But the big question is..... will it last?