I'm having exactly the same problems. Oddly enough, when I was playing the old version of the game, I didn't have an energy problem at all ... I just left them over night, and they woke up almost fully energised. Now, I'm lucky if I get a half-full energy bar after having left them over night. I find it very odd that a version that was supposed to fix a fault actually created that fault for me!