Good luck Trish, hope it works!! I don't have any suggestions because I've never really had issues with mine getting out of their wraps until much older and by then I was able to ditch it all together. Even when D manages to get a hand out it doesn't wake him.

Sounds like you're having a rough trot atm, hope it passes soon