Nazly, you're not supposed to swaddle once they can roll. I think it is because their arms aren't free to push back over or to raise their head.
Thanks Fate!
We ended up going off plan due to a problem with our washing machine meaning the swaddling blanket was soaking wet at bedtime. Instead we had to use the Hana wrap, which has previously been unsuccessful as she can move her arms quite a lot. She's able to knock her dummy out, but she can't actually claw at her face and eyes. We didn't really have much choice, so though maybe using this wrap instead of full on swaddling could be part of our strategy! Managed to get her off to sleep ok and she's been in the wrap all night! She has woken more often than usual and needed feeds to calm her where normally just putting the dummy in and stroking her hair for a few seconds works. Normally she gets through two 5 oz bottles over four feeds, but she's had most of a third one tonight. I'm not sure she's actually woken more than usual, just needed more help and feeding to get back off.
I think it has been a partial success, and it was actually easier than having to re swaddle her every couple of hours 
Now I think our strategy will be to use the Hana wrap at night, and for naps stick to the traditional swaddling, trying with left arm out until she gets used to that, then add in right arm out. Once she's used to napping without swaddling we will stop using the wrap at night.
I think I going to put a limit of 20 minutes of crying on the swaddling with one arm out attempts though. It may take longer to achieve what we want, but I know that she gets herself into such a state it will be counter productive.
Let's see how today goes...
Oh, someone had asked what I thought about the web chat on sleep issues. Honestly, it didn't tell me anything that five minutes on Google hadn't already told me.
Dreading today. DD is meeting her paternal grandfather and his evil wife. I have bought a bottle of wine for tonight in preparation! 