Ok - first off, the swaddle.... I think in general, you wait for them to be ready to be out of it, yet at the same time, you can also "help" them get to that pt, ykwim? We weaned our LO from the swaddle at around 4 mo because she was breaking out of it constantly and we were having to get up several times a night to reswaddle her. So I did one arm out for her best nap for a couple weeks, then one wkend just cold turkeyed it. If you're going to do the one arm out, you might want to stay close by as she's going to sleep and help by holding down that arm if it starts to flail too much. We had to do that the first couple wks after we swaddle weaned - especially if she was OT... then gradually, we were able to stop "helping".
Am a little confused still about your WD routine - sorry... So you walk in, turn off lights, turn on music, and walk... right? When do you actually swaddle her? Also, are you shh/patting while walking? Have you tried putting her in the crib before and shh/patting in the crib only? Or perhaps, like pp said, the shh/pat is now too distracting? I have gone to just a shhh with my LO now... sometimes I put my hand on her chest or legs, but no more patting...
From your EASY, it looks like your LO is getting 10 hrs of night sleep? Have you tried bumping the bedtime routine up a bit in order to get more nighttime sleep? You could try cutting down a bit on the CN and moving bt up? What do you think? Also - maybe try 2 hr 15 in of A time for the first one and see if she doesn't fight you as much going down?
Keep us posted!