Of course we will solve energy storage. There are thousands of different battery chemistries, and large numbers of non-battery storage options (including ones like hydrogen that will do much better than batteries for long term storage). And even with very near term storage improvements, renewables will beat nuclear at providing base load.
https://model.energy/