i would stop wrapping when he is rolling definately so he doesnt roll over and cant get off his face.
The startle reflex will start to slow down now he is getting older too.
But i would wrap one arm in and one out then went to a sleeping bag with #1.
No. 2 was a tummy sleeper from birth so no wrapping
Winter will be great for this transistion because a 2.5tog is nice and heavy on their legs and similar feeling to being wrapped.