It will sound strange in this forum, but i'm not follow this topic in details. But from what I think based on observation all the stuff around - In my opinion US is now aware that is loosing on this trade war more than China (there are economic studies about this). So if you know that in long run you will loose more and can't stop China before being biggest in the world (in long run) - you have two options:
- to make a deal that is not great for you but is working fine (for now) or
- to make war (normal military war) - fo course not with 1 country, it must be something with global range - this is the best known way to cancel the debt (and US is completely in debt and using paper money that has no worth, only global settlements make it still alive) and to stop others from grown and in fact to hold "old order"
So maybe all the Iranian situation (killing one of most important persons in Middle East when he was ON DIPLOMATIC MISSION) and escalating conflict sending thousands of soldiers etc. - it's just a signal - "if we don't do it easy way we will do it some way". Because if there will be open war, Russia will stand for Iran and willing or not China will take a part in all this. And for China military war no is not best option - they know that all they need is time. Just time and they will be bigger and stronger than US (all the centuries had their most powerful nations, Spain, UK, then US, and XXI is time of China). Just the big puzzles. we have a clash of interests in many places - Venezuela (US, Russia, China), north Korea (US+South Korea, China) etc. etc.
Answering the question - if they choose peaceful solution - there will be deal, not great for US but also not great for China (compromise). If they choose no deal there is possibility of global conflict - as a smoke screen for economic intentions. Iran has new very large oil fields, so it's target for US "democracy" and who is controlling strait of Hormuz is controlling all the middle east oil transport... And you can slow down China in the same time.