well Jake is 5 months, and was swaddled till about 2 weeks ago.It has been very hit and miss, but I felt like you..... a swaddled kid at Univeristy aint good!
We went with a sleeping bag(gro bag), but at first I used a light small sheet swaddled over his arms, to break him in gently.
After that I would put him down with his arms inside the sleeping bag, and during the night he would work them out the arm holes!
Now he sleeps in his sleeping bag, and it's lovely to see, plus he sometimes polls over and sleeps on his tummy, which he likes.
I say go for it, be be prepared for a bit of upset, its worth it.
good luck x