Hitman shorts sizing question

So I've decided to get some of the tight fit shorts for training/wearing under my gi or whatever, I'm a pretty skinny guy, about 6'4" and change and usually 190-192 pounds, although I'm way down to 180 right now and would like to be around 200 in the future.  I wear a 34 in the boardshorts but they're pretty baggy (especially now).

Medium or large?  Thanks.

I have a question too Dan, I like the tight shorts as well but with my small unit I get embarrased when the front of them is just flat, would you wear a cup or would you just go with baggy board shorts and lots of riffles in the fabric and lots of elastic? Please respond soon....

A cup would be too obvious.  I would buy two pairs of shorts, wear one and stuff the other pair down the front.

I guess no one wears the little shorts anymore.  Whenever I get mine I'll be sure to put up some pics for everybody.  I'm bringing them back.