Bring a pair of jammers and a pair of swim trunks. He might find that he prefers one over the other. It's always good to have options anyway in case there's chafing or you need a dry suit.