Why are you giving him a fully stocked diaper bag? Why doesn’t he have his own bag and his own diapers? I’d stop that right now . Hand him a paper bag with any bottles needed and the name and size of the diapers you buy. Tell him he needs to buy his own stuff for S. Or just gift him a cheap gaudy diaper bag.