I don't see how gravity storage could possibly scale. Pumped hydro was the dominant storage tech, but is severely limited in geography, so there's no easy way to scale that. Solid weight gravity systems might come online at some point, but nothing about the trajectory of their development suggests they'll leapfrog chemical batteries in overall adoption.
And the battery chemistries I'm most excited about don't involve lithium at all. Sodium batteries are starting to come online, and some metal-air systems seem to be ready to hit the market soon.