Pumped-hydro suffers from a serious capacity lack.

Flywheel storage is OK for spinning reserve (responding to fluctuations on the order of an hour or two) but is too expensive otherwise.

My money is on thermal storage, and cheap-substrate batteries (molten salt, liquid metal) for longer-scale storage. For national scale grid storage there are many alternatives for which there's simply not sufficient material to create a feasible alternative.