Your close to the line, best to try them on in person.

With ~waste size, I wear a small in Pearl Izumi... but a Medium in Sugoi and most other higher end brands... Most EU brands run smaller, I'd gamble on the medium.

Get bib shorts, WAY more comfortable. I never wear my regular shorts anymore.