surfboarder

(noun) surfer

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