This article suggests allowing athletes to represent clubs and college instead of countries:
"“In a globalized age, one can imagine the nation-state being removed from the Olympics,” he says, suggesting other sports organizations or even universities could compete – not unlike the early days of the Games, when athletes represented their sporting clubs. “It’d still be the best against the best, but you wouldn’t have the jingoism and chauvinism that you sometimes have.”"