Oh big hugs. I know how you feel.

Bubs changes all the time. Just when you think you have something downpat then they change it all! My biggest advice to you would be just to relax and enjoy your bub. Is he happy when he wakes? He may not need to sleep more. If he is grizzly and you think he really is tired you could try starting sleep music to help tide him over the 40 min period (it takes a while to start but may help) or trying some aromatherapy like a drop of lavender on a corner of his cot.
You could also try a comfort item like a dummy or a blanky (even just a thin piece of sheet can work as a blanky).

Sometimes routines just aren't realistic and sometimes they work until the bub changes yet again. Don't try and work around someone elses ideal of what you should do. Just try to work with what seems to work for you and bubs.
I hope this helps.