I have the same battery problem, but foolishly changed to LOS with which I'm very familiar. But my phone is trash. So, I guess I have to reflash Havoc.My battery last 3 days. I don't use my phone much though. I also have the vanilla version. I noticed when I installed Google apps life dropped to just over a day. Gapps obviously does a lot of tracking, permission granted or not.
I love this rom. It is the first one I have installed and refuse to ever use the stock rom, and Motorolla stock roms are not bad (unlike Samsung.) Too bad development has stopped for this device. Paired with this rom this is the best phone out there, period. My screen is all cracked to hell and I refuse to get another phone unless it is another sofia.