Order 1-2 sizes up.
I order 2 pairs of shorts in different sizes as the sizing chart was designed for wetsuits.
I immediately fell in love with the shorts. However, both were too small. So I returned them. The return process was easy with no hassle. And ordered the next size up.
They fit, however I do wonder if ordering them in men's sizes would fit better over different wetsuit thickness. Unfortunately, without trying men sizes on in the store, I would be stuck with ordering various sizes and returning them to find the right size.
I have dived with them over my 3mm and I'm satisfied with the shorts overall.