My son was similar. We decided to drop the day sleep and put him to bed a bit earlier. Sure he was a bit cranky from 4:30pm onwards for 6-8 weeks so we kind of just laid low in the afternoons. Stories, blocks or pottering around the garden worked a treat. Calming activities that weren't too stressful for him or so boring he would fall asleep. He was straight asleep at 6:30 and then wouldn't wake till his usual time either which was probably just luck. Perhaps give it a try for a few days and see how it goes. I felt so much better after we stopped the day sleeps as they were becoming such a stressful time and ending with us both in horrible moods for the rest of the day. Good luck, I hope you get it sorted by the time hubs arrives and if not just remember - this too shall pass.