I won't speak to the veracity of your numbers. I have no idea your methodology or even if you're qualified to do an analysis here or the quality of your data, so...
But I will point out that the current plan to address this is to repurpose and recycle existing lithium ion battery packs at sclae, while continuing to develop very large electrical energy storage methods.
A real-life example of this is Tesla's Australian contract (https://www.reuters.com/article/us-australia-power-tesla/tes...) which uh... literally started on twitter as a dare between rich people (https://twitter.com/elonmusk/status/840032197637685249?lang=...).
Very large power storage stations like this actually offer a lot of utility in a variety of scenarios. Not only do they make distributed grids much more reliable offer a facility to ground out excess energy on the grid (helping reduce the impact of solar phenomenon over large-scale transport networks), but they also have a lot of value in disaster recovery scenarios.