Swimming costume, but not one that will just fall off if you look at it wrong. (But it can be a nice one! Just don't let it fall off.) The warming charms are stellar. I'd also do the Gillyweed unless you're totally weirded out by webbed hands and feet and temporary gills. There'll be chances to dose up again, and the guide will never leave you in a dangerous situation. They do tours all the time.