Not sure if I've posted in your threads previously but have you tried gradually removing the wrap by swaddling with one arm free for a few days, then both arms free? I then moved to a sleeping bag. He was only 6 weeks old though, and never had a dummy so I can't offer any ideas there either, sorry...