Another option is to wear lycra suit under the wetsuit and leave it on between dives. When wet the lycra will help keep you cool on the surface interval. but it dries pretty quickly.
Dive Skin Rashguard 3 Piece Package | MAKO Spearguns
Dive Skin Rashguard 3 Piece Package | MAKO Spearguns