Shorts fit a bit looser. If a larger would usually be a bit big on you I’d go medium. Shirt is meant to fit relaxed.
