Right, the point was simply to provide a plausible mechanism by which we could continue to increase our energy consumption exponentially, for the sake of argument. The thought experiment of "global warming from pure energy expenditure" doesn't work if the energy source is solar, because that energy offsets insolation.

I'm not particularly bullish on fusion power, though we can dream.