At this point, it seems really unlikely we will "solve" the problem. I suspect we will go with flood defences, water management projects and geo-engineering.

So I think it's safest to take the cheapest option. Right now, that seems to be green energy (wind and solar) plus some gas power to deal with intermittent supply.