Honestly I would just do what works. If your little one still likes to be swaddled I would still swaddle. But I do know what your talking about. We ended up doing a modified CIO, because DS did not want to be swaddled anymore- screaming for hours trying to get him to sleep is what cued us :/ .... We have not gave up the pacifier though! It is the only thing that stops his crying (eventually) at this point and puts him to sleep.
ETA: we do not have to keep re- inserting the pacifier. Although we used to have to but that was a phase that he grew out of..
How old is your baby? Your still using the swing? I might try to wean her from that first. We used to use the swing for naps and that was the first thing we got rid of. It was a battle but consistency worked. Whatever you do just stay consistent. Is your baby ready to be unswaddled?