So, a couple questions;
For one, tennis, golf, NBA players from any nation, soccer, ALL must be banned. Those should not be Olympic sports.
For two, what if a permanent home? I read a good piece describing what a fiasco this is moving from nation to nation. Each new venue being an economic debacle for the host, loss of experience each time, trying to make the new venue work each time instead of getting better and better.
There were two good suggestions; one, hold them in Greece, permanently, or, two, disperse the events, let Greece be the home of, say, track and field, some other nation, the US, home of swimming, perhaps South Korea the home of archery, etc and so forth. Simply have everyone fly into Greece for the opening ceremonies and then off you go to the nation that hosts your event every time.