Pumped hydro is better, but not available everywhere.

Depending on geography, but yes, it's rare that you have all requirements for it (hill, river etc.)

I expect sodium-ion batteries to be the main type of storage going forward, but who knows?

These certainly seem like the future. There is also fusion, but it won't be feasible in near future if ever.