I think small might do it for you. Patagonia T's are running a little big, and I thin the small will give you an athletic, slimmer fit. Medium wouldn't be huge on you, but a little baggy would be my guess.