I have a Gore jacket and a Gore shorty, sized up in the jacket and probably could have done in the shorty (right on the edge). I'd definitely go for the Large.