Hi there
My DS was around 4 months old when we stopped wrapping him for the same reason (plus he kept unwrapping himself!)
We started using sleeping bags instead and haven't looked back.
Hope this helps