Pumping water up a hill using solar and harvesting the kinetic energy has been proposed numerous times but it's a matter of social will to build the infrastructure to support such projects. Imagine if we built massive offshore tanks to pump sea water into and released them overnight. Inland areas would need a different solution if they didn't want to modify the landscape too much, but I think we can find a balance between traditional batteries and natural "batteries".