Honestly, instead of trying to improve or tweak the Olympics, straight getting rid of them would help in basically all fronts: no more debt ridden hosting country, no crazy corruptions schemes flying all around, other events an keep their sheer sport focus, centered on the athletes and not where they register their passport.

We'd keep events like the Eurovision for the festive and "your nation is worse than mine" parts. It would all be fine.