The fastest way to end the war with Iran is to actually defeat the regime or make a deal that doesn't defeat the regime but attempts to contain it. The truth is that it cannot be permanently contained for several reasons, including that if a Democrat becomes president, or even an isolationist or establishment Republican, the necessary military force will not be used to ensure compliance because the regime itself is fundamentally and ultimately incapable of honoring a deal given its fundamentalist Islamist ideology. Also, the public will tire of it over a course of years (a forever war) and there will be other enemies that will require some form of attention, thereby requiring our military resources to also deal with them in some form -- perhaps an even bigger foe, like Red China.
To defeat the regime requires: 1. continued military operations aimed at obliterating the IRGC and perhaps key dual use infrastructure; 2. continued maximum economic pressure, especially continuation of the blockade; AND 3. arming the people in Iran, a very important and necessary resource (we've done this before during the Reagan administration and I presume the CIA is still up to the task).
The president will be criticized regardless of how he proceeds, as the Democrats and their media are rooting for the enemy and hope to gain advantage in the midterms. So, they must be ignored. But a real victory will not only ensure our security from a nuclear-obsessed terrorist regime beyond the Trump presidency (as it won't exist any longer), but the American people will ultimately praise it as victory has a way of focusing the mind and the heart (which should have political benefits as well). I am concerned that waiting for the enemy to come forward with some kind of an offer, which might be framed as a victory, could be problematic.
I must caution, however, as I have before, that I am not privy to all the information. And I also underscore that President Trump is never to be underestimated. He is a truly gutsy and great leader. Indeed, he has done more than all previous seven presidents who preceded him combined to deal with the Iranian regime's grave threat. And for this alone he will be remembered long after most of us are gone.
That's my 2 cents worth, again.