It's not something I'm deadly picky about, but I do prefer shaved, I'd not expect her to wax as I'd imagine that would hurt like hell in comparison... I've really only been with a few girls who didn't shave or at least trim, it's only put me off slightly once, but I think it was an overall combination of poor hygiene and overgrown parts that turned me.
Natural but groomed. What I mean by this, Natural is great BUT keep it in check. It really depends upon your natural hair. Wax Perinium and Anal Area. TRIM pubic hair with scissors or a long guard on Clippers. I personally like a #3 or #4 Guard on the clippers. Nudity is the best for swimming - embrace it where you can.