I'm actually looking for a bit of both. Since I quit sports in college (4 years ago now,I think?) I've fallen pretty out of shape. I'd like to get back in better overall shape. However, I've started taking some martial arts lessons from my boss (no particular art...basically a crash course at the moment in Kempo, Aikido and BJJ to start, then moving on to more in depth of BJJ, when I plan on also joining a boxing gym and refining my skills in that regards), and would like to get myself into fight shape once I feel I've gotten into decent overall shape.

When I do workout, I workout pretty much to exhaustion, and go home pooped and shaky :P