You may not need to wean from the dummy just yet... We stopped wrapping Freya at 6 months, and straight away she was able to find her dummy in her cot and put it back in during the night if it fell out...
I agree. My son decided at about 4-5 months that he hated his arms being wrapped in, so I started to wrap his body but wit both arms out, and then put him in a grobag not long after.