Battery storage is still mostly LiIon, simply because it has a lot of preexisting investment in R&D and large-scale production. I expect battery storage to become much more economical once a technology developed for the requirements of grid-scale storage takes off. There are plenty of good candidates, but none of them seem to be quite there yet.

I also expect a lot more hydro to be built eventually, it's not as dependent on geography if you just build two ponds at different elevations for pumped hydro, or repurpose old mineshafts to get the elevation difference on flat ground.