I wear these
Under Armour ® | Men's HeatGear® Compression Short | 1000026 | $24.99 with board shorts over the top - pull the board shorts, slip on the wetsuit to dive in, then when i get out, strip the wetsuit and put the shorts back on - they dry super fast as well.