L.S.
Well, you better get him used to sleeping without it. He won't be swaddled for much longer and sounds like instead of asking how to keep him swaddled, realize he is moving onto the next phase in his little baby life. Get him used to things now with a few bumpy nights then you won't have any problems with him when he is two. Was he crying for the pacifier or not being swaddled? I would wean from both as they are habits you will have to break later. A few nights now or hell later when they are 2. I would choose now since he can't fight with you like a 2 year old can make tantrums over the paci or sleeping arrangements. When they get old enought to get out of the swaddle then it is time to start giving it up.
Good luck,
L.