M.R.
It might be alittle late for a response, but my son is a big boy and i use to use goodnites w/ little boy underwear over them to prevent gapping in the legs. These goodnites go up higher on the belly so my son wouldn't pee out. I also monitored his drinking b4 bed but we were also having him try to go potty b4 bed also, just to start. Also I just saw at giant eagle that they have block 7 diapers, i never tried them, never had to b/c they didn't have those when my son was older, but you may want to try them out and let us all know how they work.. lol good luck!!
M.