Terrament is working on a modular gravity storage solution that uses deep mine shafts to gain 20x more height than stacking blocks above ground. So you don’t need water or mountains. And since gravity storage uses ballast that is really just dumb weight, it could even be economical to make that ballast a secondary storage like thermal storage.