The best solution has always been for the people of Iran to free themselves.
We have been waiting (and hoping) long enough to know this is clearly not going to happen.
It only takes one side to start a war, and Iran is clearly intent on doing so. The only question is: Will we strike first?
Side Note: Israel has no choice. If the U.S. fails to act, Israel MUST. The political/military consequences would be much worse if Israel is the entity to take action, so I would expect the U.S. to do the job. Right now it looks like even Great Britain intends to wimp out, so we will have to act alone.
But we've done sorry little to assist.