Solution: we must stop electricity pricing based on energy produced (which made sense when using fossil fuel) and switch to a pricing mechanism where you pay for available power because that's where the marginal cost is increasing.
But just pricing per kWh can work. If the limit is available capacity at 6PM, then those kWh are the most profitable and capacity will be built to meet demand at 6PM.