Yes, pretty much, except getting to working fusion is not guaranteed - but the climate disaster is, so we have to make a bet. Solar and batteries are the obvious fallback plan. Nuclear should also be, but it’s a hard sell.
We seem to agree that there is a major resource allocation problem here ("shortening ... the Iran war by a couple of days"), but you still haven't explained how oil becoming scarce will cause breakthroughs in nuclear fusion to occur. I might accept the argument if it were just about solar (which mostly needs straightforward deployment). But nuclear fusion research requires spending large amounts of resources without any kind of guaranteed payout, so I would think it would only be hindered by energy becoming more expensive.
I'm not saying it will, I explicitly said it's a bet I think we should make. Your argument that it's only going to be more expensive going forward is something I agree with and indeed extra motivation to take the bet.