I share your concern
ISTM that the greatest challenge is to use the growing demand towards growing renewables capacity even faster, so that it quickly attracts demand that currently goes to non-renewables.
that's not a given, and there's a significant risk for the growth in demand to drive increase in non-renewables, but the economics of renewables are so good that I wouldn't rule out their taking over either, especially if (and that's a big if) public policies shift the economic incentives the right way