Wow, rolling even when he's wrapped. Golly, that's a bit clever. If the wedge thingy works, then great. I reckon you've got to just go with what works until it doesn't anymore, kwim?
Breathe easy, Loulou. He won't want to be wrapped forever - he might get a bit cross if you try it when he's a teenager