I think you'll be straight with an XL. Most people consider these suits to be pretty baggy. You could always order the XL and XXL, try them both on, and return the one you don't like hassle free.

When trying on, put pretty much all of your gear on- boots, gloves, layers, etc- and strap in. try sitting down in a chair like on a chairlift, etc.