We moved away from wrapping by putting a light blanket over DS (polar fleece was good for us during winter) and tucking it tight into the sides of the cot. That way he could have some movement but still felt the comforting pressure of the tuck. If you can't tuck it in tight enough to get roll up a piece of cloth and wedge that in when you tuck the blanket so it doesn't come out.
Hope this helps!