I'm not sure there was an easy solution, but Trump letting the status of Lebanon be part of the MOU was an incredible strategic error. It means both Israel and Iran can nullify the MOU at any point.
Also Trump suddenly very clear on the stakes: keeps mentioning Herbert Hoover and the Depression.
Gawain
No serious diplomat would have signed a doc that (1) commits someone else (Israel) to doing things they didn't agree to, and (2) promises to not issue threats and then issues threats.
Hands the other side leverage.
Maybe a corrupt son-in-law and real estate investor buddy weren't the best choice.