Surf Shorts, 2mm with drawstring.  Avoid board rash and chafing. These shorts are also good for outrigger/dragonboat paddling.
They are also good to wear under your boardshorts for wakeboarding.