I agree with what you say. I would like to point out that there are big batteries called water reservoirs that bring huge energy output when actually needed. Maybe with more creative 'batteries' we could solve problems like the ones you point.

I hope we will see big advancements soon enough although I am cautious about this happening anytime soon in the US.