Fusion sort of looks like it will give you that dynamic, only more extreme. Fuel even cheaper, plants even more expensive and time-consuming (and risky, given lack of track-record)
Solving the waste problem is nice, but not climate-relevant (and you will still be generating a bunch of activated metal due to all the fusion neutrons)
I agree with you that humanity wants to be fusing a lot of hydrogen in 100 years. I don't think it's super relevant to the challenges of the next 20, though