My solution is to completely isolate the Middle East countries. No one from those countries can travel to the U.S. No flights originating in those countries can travel to the U.S. This goes for businessmen, family members, diplomats, whoever.
When they get their people in line, they can join the rest of the world. Until then, stay home.
You are going to let the oil tankers out aren't you?
It worked on Gaddhafi.
I see no reason to admit Muslims at all to this country until they begin to play fair with freedom of religion.
Unless and until there is freedom of worship in Saudi Arabia, no more muslims, no more mosques.
And that goes for the rest of their screwy ideas as well, especially homocide bombings and terrorism as a way of life.