S.M.
wow, that must be driving you crazy ! I have a great solution, put him in one of these sleeping sacks, like infants, they make them bigger as well, I had my daughter in them until 3, if she needed to get up, she could unzip the bottom, or call me !maybe a regular sleeping bag would do, I know Pottery barn has nice cotton ones, that are as big as a single bed, so he doesn't have to sleep in a polyester one !hope this helps, good luck