The intermittent problem is the one that worries me the most.
As an engineer, if I think really long term, I would like to couple water storage with energy storage. I think water will itself need to be stored in a better manner. And I would store it in tunnels at different heights. And optimize that height difference for maximum potential energy.
The tunneling tech would advance faster when it serves both of these functions and things like Hyperloop.