I have a 34" waist and if I relax my "gut" it is 40" and when diving I am sure my "gut" is relaxed and I have ZERO issues with my L/XL. I think you would be more than fine with the L/XL. There is a TON of room in the mid-section of the suit. I would say the mid-section is actually the most flexible portion of the suit..