I'd still take UAE vs Saudi, over Iran destabilizing everything in the region (Lebanon, Gaza, Syria, Iraq, Yemen, Western Sahara). Not to mention supporting Russia and North Korea.
Right, the Saudis have never destabilized anything, nor have their embrace of batshit-insane wahhabism created the environment and the people that flew two airplanes into some highrises a few decades ago.
Qatar is pretty much screwed as they can't get the gas out of the Gulf. The Saudis will have to eventually do something about Yemen, because Bab Al-Mandab tanker traffic is also under threat and Asia id paying good money for fossil fuels right now.