Okay - don't know if I am any help, but Caeden is about 16 weeks old and I am still swaddling him. We tried not for a while, but he just doesn't sleep as good. He also protests when I wrap him up, he knows it is time to sleep and though he may be very tired he still cries!
I am continued to do it and tell myself even when he cries for a little while (anywhere from 2-10 minutes now) it is for his best cause he sleeps better and longer when swaddled and at night it is getting colder and it keeps his hands warm too.
He has always cried a bit before going to sleep, swaddled or not - I think it is just his way of winding down and putting himself to sleep. And I think he cries a shorter time when swaddle versus not, haven't fully tested this theory though!
For what it is worth - usually if he gets one hand out while upset I will let it stay out till he is asleep or almost asleep and then re-wrap him up. No fuss or little at this point. Though it doesn't work as well if I wait to wrap him till he is asleep, like I said, I think he settles quicker overall wrapped.....
Anyway - don't know if that helps at all, just my experiences here! I am only a couple weeks ahead of you all!
I would though keep wrapping them, more then likely they really do still need it and will "learn" that this is how we go to sleep and not "wap themselves silly" as one gal said!