I hope everything that possibly can go wrong with these Olympics does go wrong (apart from any more deaths, obviously).
Many of the events involve intensive training for one very specific skill. Years of a person's life taken up in the pursuit of personal glory in an event most people only remember exists when it's shown on TV.
What about requiring all participants to compete in a minimum of three disciplines, to show they are all-round athletes. And requiring all athletes to use the same standard equipment, to iron out equipment based advantage. ??