Nuclear will in theory run out one day too. But, I would lean towards more nuclear along with more wind turbines.
Maybe geothermal should be explored for new builds - can work with underfloor heating, need to go down a long way, but housing developments could have communal pumps. Of course, that will lead to problems with managing it ...