Batteries are also getting cheaper and cheaper

This is why a major part of the solution is electric vehicles. Why put batteries in a warehouse and then run vehicles on petroleum when you can put batteries in a vehicle, install twice as many renewables because you now have more demand for electricity, and then charge the vehicles when generation is a large percentage of rated capacity and still have enough to run the rest of the grid when it's a smaller percentage?

And they are the only real solution. Demand fitting production is never going to work unless we give up all the autonomy.