Thank you so much for playing!
I've been working a lot on the game flow and redesign a lot of system for a new version for a while now and happy to announce the energy system have been put on the shelf, I've basically came to the same conclusion as yours after a lot of playing and thinking :D
It's a lot of experimenting trying to figure out a good system so your feedback is invaluable, I'm very much appreciate it :D