You have basically nailed it with the above comment(in bold). But i guess its easier said than done. Its going to get a lot worse if relations between Iran and the rest of the world improve. Iran, being Iran, will want to increase its influence a lot more in Syria, Iraq and other countries and that will make the Saudis even more pissed. Which means more covert wars and more bloodshed. Sad to see what the Arabs and Persians are doing in that part of the world.
In fact, let me add one more thing. Even if a country sorts out its affairs, it still has not right to meddle in other countries affairs