how to stop swaddling

Holli
Any advice? She is almost 4 months old. I've been trying the one limb at a time thing.. she is okay with her legs free considering in the swaddle wrap I have for her has leg room anyway. She will SOMETIMES fall asleep with an arm out but it's torture. She won't stop digging her hands into her mouth. I try not to give up and just put both her arms in, but I do and feel so defeated! After that she will stop screaming. 
She fusses and cries before EVERY nap as it is now, it feels impossible. It's taken an hour now to get her to sleep for a nap. She does fine at night for bed! Fusses a little but won't scream or cry or anything.
I'm going to try to put her to bed tonight with her arms free and see how she does at nighttime.