You're right on track.

Surfers invented the wetsuit. No self-respecting surfer wears anything under their wetsuit except maybe an upper body rash guard. I've been using/wearing wetsuits for 20 years and would never dream of wearing anything underneath.