T.T.
Huggies makes an overnight diaper that works pretty well. My daughter is 22 months and we still have that issue. She's also in 3's but I get 4's for over night. Luvs is also a good brand. If you get the next size, even if it is huge, it should help him from leaking.