Flow batteries are looking pretty good. Costs are coming down, and the very high (some say unlimited) cycle life could give an advantage over Li-ion for stationary applications.

On the other hand, used Li-ion from electric vehicles could be so widely available that they also win for stationary storage.

Interesting times.