When it comes to grid scale storage, I think there will be rapid advancements because the constraints for what what makes a good grid battery is so different from what makes a good laptop or EV battery, and we've really only recently been investigated batteries with those constraints. I.e. for decades battery tech has been concerned about things like weight-to-capacity ratios, recharge times, etc. Most of that hardly even matters for fixed, installed batteries at power plants.