Martial Arts advice

In my (limited) experience, Capoeira fills both of these roles; while it can be both full-contact and aggressive, it also places a large emphasis on agility, spatial awareness and reading the intentions and movements of other people, quickly. It's also awesome for core strength, flexibility, and cardio-vascular stamina... It's often seen as a bit of a joke martial art, but this is mainly based on common misconceptions about the practice.

These two videos are two brilliant examples of capoeira.

http://www.youtube.com/v/zgyYL09tUos

http://www.youtube.com/v/1CHpsAr7LO0

The only difference being that capoeira makes you look like a berk ;)