i used to swaddle after mine fell asleep with a halo sleep sack swaddle. i'd leave the wings unfastened till he was asleep, then lightly fasten enough to keep arms down once asleep in crib.
had to phase this practice out around 12 weeks when i started trying to teach him to fall asleep in crib, but by then the arms were improving and we weaned leaving one arm in and one out, which he tolerated.
my sympathies, a swaddle hating baby is rough. mine also hated pacifiers, ugh!
oh and make sure she is tired when you try to swaddle for naps. mine didn't resist that or the pacifier as much if he was sleepy, then it relaxed him a little. but if he wanted to be awake, no swaddle, no pacifier, no way.
if i had to do it again, i might try weaning into a swaddle the same way i weaned out of it. swaddling one arm at a time. no idea if it would work, but after seeing it work to get him out of it, it might be worth a shot.