surfer

(noun) surfboarder

swimmer (generic term)
natator (generic term)
bather (generic term)