Greenstreet Sports Fit Cotton Button-Up Shirt

I am a large or 16.5 34/35 in almost every shirt, i tried this in large and i have restricted movement in my shoulders to the point that i would feel it pulling on me even to hold a steering wheel while driving. I do have broader shoulders than most. It is also tight around the stomach, but that is more of a product of my dad-bod than the shirt itself. Thinking about getting it in an XL, but not sure it will solve all of the fit issues. Shirt is otherwise exactly as depicted.