If you have become a prop, then it will be a case of making sure he always falls asleep without you touching him. Yes it will get worse before it gets better, but (I know this sounds obvious) there's no way of using a prop to wean a prop if you see what I mean.
The only other thing that seems like a possibility with all that squirming and rolling around is discomfort - could something he is eating be bothering him?