Nukes for baseload, solar for peak...
Simple really. Of course to avoid long-term storage they need to use better fuel cycles in the reactors. Integral Fast Reactors only produce intermediate waste that's safer than mine tailings in 300 years. Of course they also need R&D that someone has to pony-up for...