Those are incredibly thin justifications that don't really hold up to scrutiny.
1) The deal was holding. And even if we take Trump's word for it that it wasn't, he told us that he destroyed their nuclear capability a year ago. So either he was lying about that, or there was no serious nuclear capability in the first place. Regardless of how that shakes out, there's no reason we should believe this justification today.
2) This is incredibly speculative, and no serious intelligence analyst or military strategist would suggest "war with Iran" as a solution there. And the joke is on us, anyway: China may be feeling an oil crunch, but we're depleting our stock of a bunch of materiel that we'll need if it comes time to defend Taiwan. On top of that, China's military leadership is seeing how incompetently the US is prosecuting this war, and is likely feeling a lot more confident about their ability to fend off a US defense of Taiwan.
Even if we destroyed it, RU would be happy to resupply. What has this war that nobody wanted cost just at the gas pumps all over the world and who stood to benefit? I really do think I’d be better off having had been born a century or two ago reading books under a candle and digging outhouses when needed.
The US military is prosecuting the war just fine, US losses of materiel and personnel have been minimal (not zero, but close enough). China's takeaway from this is not going to be that the US military is incompetent.
The fundamental problem is that the declared objectives of regime change and securing control of the Strait of Hormuz cannot be achieved through air power alone. And this is the fault of the president, not the military.