Boo for the short naps. Around this age, a lot of babies have difficulties transitioning between sleep cycles, even if they are tired. I had to APOP a longer nap with my dd (eg. Transition her to a chair or swing or go out). I did try to nap extend which was usually was more successful if I shh'ed her before she woke. So if your Lo is waking at 30 min, try going in at 25 min and observe and start to shh him if he is starting to wake. I know some moms would lay their hands on them to prevent any movements from waking them up. I would try this for may be 10 min (20 min tops) and if she woke up, I'd go to plan B (ie. swing or chair or we would go out in the car). By 4.5 months or so, she learned to transition between sleep cycles on her own.
Wrt the swaddle me wraps, my DS could move his arms a bit. My dd didn't really fight the swaddle.