Sleeping location

Baby has only rolled over one time. We’ve been using an arms up swaddle for maybe two weeks after using the Velcro swaddles since he was born. I feel like he’s still getting used to this swaddle. He hasn’t been sleeping good at all but he’s also congested (side note I’ve done all the tricks for that) right now we have him in the halo sleeper next to me. But the pass two nights in the early hours of the morning out of pure desperation for him to go back to sleep we put him in the dock a tot next to me so I can comfortably keep my arm on him and he feels the closeness.

My question what is a safe way to keep him in our room and next to me? besides using a pack n play or bringing the crib in here. Or do we bite the bullet and put him in his own room? Follow up question for that is... should I give it a little bit longer til he’s not congested and or used to this new swaddle?