PO and CC are not mutually exclusive.
GHGs are persistent, lifetimes in the atmosphere spanning decades at least and no reduction in sight.
Sunk costs in FF consumption are as overwhelming as ever. Retrofitting in a growing economy even with the cheaper RE will likewise take decades —and that's in a growing economy with governments that "believe" in CC.
If the economy sputters, nationalism impacts trade or worse, CC bites, PO bites, and/or population growth stagnates, killing econ growth, the easy decisions of simply building new capacity with cheaper RE becomes the hard choice of decommissioning perfectly good FF generation to cut GHG emissions. Double that if PO raises the overhead cost.
Non-hydro RE is still tiny. This is primary energy (million tonnes oil equivalent), consumption of which increased 2.5% last year:

Obviously the threat of PO is as real as ever because energy demand continues to rise. Running out was never the threat, constrained supply = high price = difficult mitigation is the threat, same as it ever was. And of course "constrained supply" doesn't need an actual physical peak, just higher demand/supply.
Latest from Matt @ CrudeOilPeak.info. Increases have been keeping up and exceeding declines but only by increments.

So not out of the woods yet as a society. On the bright side, personal energy prep is far, far easier than 20 years ago, that's a huge relief. In fact 20 years ago there wasn't a lot to be done without a large budget or drastic measures, or just ignoring it.
.
The legitimate object of government, is to do for a community of people, whatever they need to have done, but can not do, at all, or can not, so well do, for themselves -- in their separate, and individual capacities.
-- Abraham Lincoln, Fragment on Government (July 1, 1854)