hi all;
We went through something similar with dd. In the end what worked for us was that we would lay the wrap in her cot, get her ready for bed (although i still feed to sleep) and then put her in the cot on her side and roll the wrap over her tighty so that she felt the wrap but was not really wrapped in it! it was good enough to trick her into thinking whe was safe, but she had the freedom that she was requiring as she absolutely hates being wrapped under any circumstances!
It might be worth a try anyhow!