Pumped hydro is interesting but the reservoir requirements are huuuge. This post makes a very convincing case that scaling it up is not that simple:
http://physics.ucsd.edu/do-the-math/2011/11/pump-up-the-stor...
There is some discussion about the German rock variation in the comments. The density doesn't seem to help THAT much compared to water only.