Maybe use excess electricity to produce hydrogen using electrolysis and then burn it in a turbine later?
Electrolysis isn't very efficient without nasty electrolytes. For massive scale, pumped water/air is still probably the most feasible in a reasonable timeframe and cost.