The Patriot act should go away and the US powers that be should focus its efforts on neutralizing the Sunni-Wahabi threat by whatever means necessary.
Unfortunately we are taking the wrong side here in helping the Saudi's eradicate a Shia Minority in Yemen.
What we did in Iraq was separate peacefully coexisting communities of the people you're talking about. We deliberately set social progress back a hundred years there. What you think we need to do is literally the opposite of our government's intent.