Hmmm, I'd be inclined to stop swaddling asap. Although your DD can obviously get herself into 'safe' positions for sleeping, swaddling only makes it difficult. They do say once your child can roll over by themselves then it's not a good idea to swaddle as they need their hands free to push themselves up/over, KWIM? Have you considered sleeping bags? We have used Grobags and Dream Bags since DD was 10 weeks old and she loves them. She was always swaddled but she took to bags so well. She also started rolling at 4.5 mths and sleeping on her tummy which freaked us out but we felt safer with her in bags.

HTH!