I Want to Learn Some Form of Martial Art

I used to practice martial arts, and would like to get back into it. I vacillate between MMA (or something similar, maybe BJJ or Muay Thai) for the self-defense, or something like Aikido, Kenjutsu, or Okinawan Karate for the discipline and tradition...