Xavier decided at about 2 weeks he didn't like being wrapped. So I don't push the issue during the day, and only wrap him when he's really tired at night and doesn't fight back. Even when he's wrapped he will always find a way to get his arms out.

I figure by doing a combination of both he will be warm enough at night and also learn to settle himself without the wrapping while he's asleep during the day.
Although I have considered getting a grow suit.