Urgh, it's a tricky one. DS was like that but slept better if mummified. DH had to do it though, DS always broke out of my feeble attempts.
Not helpful, sorry.