I'm no expert but I'd say stick with the routine for a bit longer - its all new and strange to him.

The alternative is to send him over to me - I'd be happy to let him snuggle with me all night