This documentary is at least 30 years old but has a wonderful section highlighting Gozo Shioda, founder of Yoshinkai Aikido.
Unfortunately the name of the documentary was – Budo, The Art of Killing and clearly the writers were inaccurate in the script and title. However the quality of the martial arts within is classic.
[http://www.youtube.com/watch?v=sud8bsZyn84&feature=related]
Tenrokan Aikido Dojo 
Unfortunate title for a great little film. Fantastic footage of some living legends(at the time) in their arts. Dramatic, yes. But they drove home the point; the martial arts can be practiced to a very high level.
The best self-defense art in stopping a fight wtihout injury is joint locks (also means joint manipulation) or Chin Na (in Chinese). Any school that offers joint locks should be good. Hapkido taught joint locks and also other skills. Aikido taught joint locks extensively.