I have watched mostly Judo and Fencing online, but when the girlfriend is over she loves the swimming and beach volleyball.
As for MMA being in the Olympics? Not any time soon. Even though Pankration was one of the first sports to be in the Olympics, I do not see modern MMA being a part anytime soon.
But certain aspects of MMA are already in the Olympics. Judo and Wrestling and Boxing. I could see either Jujitsu or Submission wrestling being added easier than modern MMA.