M.R.
I had a friend who swaddled their baby for 9 months because the baby was so fussy without it. I wouldn't worry about how long you swaddle the baby - my friend's son is now 3 1/2 and totally fine.
We swaddled until about 3 1/2 months, but took about 2 weeks to 'wean' him from it. We used the SwaddleMe wraps and instead of bundling him as tightly, we started loosening it. After a few days of that, we did it 'toga style' with one arm out. Eventually we did both arms out, then just very loosely around the waste. After 2 weeks we took it off completely and fortunately had no issues.
Try the toga effect!