If you want something truly martial then go with Hapkido. Aikido has good concepts, but is more of a philosophy than a martial art.
In terms of where they came from: Hapkido is a brother to Aikijiujitsu. Aikijiujitsu is a parent art of Aikido.
Both are good, but for you I'd recommend Hapkido. Look into Aikijiujitsu (Japanese Jiujitsu) as well. Might want to take a look at Systema as well. Perhaps Filipino Martial Arts (Kali/Escrima/Arnis) too.
Check out this post on how to choose a martial art. It has some recommendations and descriptions: http://martial.jessecrouch.com/2009/03/what-martial-art-should-i-study-how-to_5882.html
In terms of where they came from: Hapkido is a brother to Aikijiujitsu. Aikijiujitsu is a parent art of Aikido.
Both are good, but for you I'd recommend Hapkido. Look into Aikijiujitsu (Japanese Jiujitsu) as well. Might want to take a look at Systema as well. Perhaps Filipino Martial Arts (Kali/Escrima/Arnis) too.
Check out this post on how to choose a martial art. It has some recommendations and descriptions: http://martial.jessecrouch.com/2009/03/what-martial-art-should-i-study-how-to_5882.html