Agree as well. Move the games to Greece and keep them there.
On one of the bigger Greek Islands with complete control given to the IOC. The Athens games pretty much bankrupted Greece. With said island you build all the venues on a permanent basis. The IOC then controls hotels and all other revenue generators. Broadcast rights provide enough to upgrade the venues between Olympics. No one gets to the island without IOC extreme vetting. It might actually make the IOC quite a lot of money but it would require a degree of vision that I don’t think the IOC has. They seem wedded to the traveling circus model.