Have you tried board shorts or swim trunks and a surf shirt? Those should be comfortable to swim in and still give a lot of coverage.
Hope this helps and good luck! What ever you feel comfortable with!