I think it's about time they simply chose a spot and built a specific park to hold the Olympics in. The gulf states seem to be good at creating landmasses out of sea and desert, maybe they could run something up somewhere. Something that can hold land and sea based events in one place. Ideally not too hot or cold. To be paid for and maintained by some international fund, rather than any single country footing the bill. Nothing flash, no frills, just all the basic necessary amentities and facilities for competitors and spectators.