The frustrating part about solar is that because the peak generation output doesn't line up with typical peak consumption ("the duck curve"), utilities need natgas peakers, which sit mostly idle, to fill in the gap. As solar installation grows, coal baseload falls behind due to cheap natgas, and nuclear languishes due to huge capex, established baseload capacity will decrease. From now on, new capacity will largely be a mix of natgas CC, natgas CT, solar, and wind. CCs (combined cycle) are most able to serve in baseload/load-following capacity, but if solar and wind are reliable for a particular interconnection, CTs (simple cycle) are cheaper to build, if less efficient to operate.
Much of the strategizing in the future will be about trying to find the right balance of CCs and CTs to complement intermittent and opportunistic (load-ignorant) renewables, while balancing an onslaught of new regulations and activists that will force battery storage as an issue. This is already happening now, well before battery storage is cost-competitive.