I did the same calculation. Gravity energy storage is a joke. Came to similar conclusions when running numbers on hydrogen-powered vehicles.
Pumped hydro storage and flywheels are cool but ultimately battery storage, distributed everywhere, will win.