Thanks, everyone! I got the Huggies and they did the job, despite being a bit big. DS loved his swim lesson - he's already really good at breast-stroke legs!