I was about to suggest a nappy with 2 rows of snaps. That way you can do the legs a snap tighter than the waist.