I think we'll be able to solve the storage-grid engineering problems and scale solar faster than we would be able to scale nuclear. Nuclear is expensive to build.
I don't think storage is really the ideal long term solution either, storage is more short term and is more like a buffer I think. The ideal is having large interconnected grids with a great diversity of sources. We essentially have the technology right now, its just a matter of building the infrastructure which nobody is really willing to foot the bill for even though its needed for everyone.
