Personally I'd go with wrestling or judo and BJJ, with an emphasis on your top game.

Anything that gives you base and balance, and teaches you the problems associated with applying joint locks to...