I had a similar problem. I upgraded to the 1.10 rom and had battery problems. But then I went backwards to the 1.0 rom and they went away. Then I went to the 2.0 rom update and had battery problems. So then I went back to the 1.10 rom and it fixed the battery problems. For some reason, the battery problems seems to go away when going backwards in the rom updates. I'm waiting for the wm6 updates so that I can go backwards to the wm5 version. Then when wm7 comes out, I can reverse update to the wm6 version.

I know it makes no sense whatsoever. But that's how it's been working for me.