I don't know if this will help you but we wore proper clothes during the day and only wondersuits at night. If he had a wondersuit on during the day he would sleep more, crazy I know but when your sleep deprived anything is worth a go.

Is he cool enough during the day, DS seems to sleep more when he's hot. That could be a plausable exp for you as it would be cooler at night.