I have bubs in a bonds wondersuit with a singlet or similiar under, the wondersuit lets you fold the sleeves over the hands, keeps them warm and stops him scratching his face. I have been trying a few different sleep methods, like the OP I had him towards the head of the bed and in his own blankets, but he'd only sleep 2-3hrs at a time like this.
Last two nights i've swaddled him in a muslin wrap, and then wrapped a blanket around him and had him snuggled up against me on his side, whilst i'm in a warm dressing gown with my arms around him. I make sure there are no sheets/duvet/blankets that could smother him and give him as much skin to skin as I can. This has resulted in 4-5hr blocks of sleep both nights (yeeeeeha!) and also, I am very very sensitive to him this way, and can sense when he's stirring and ready for a feed or just stirring because he's farting/pooping.

Knowing the difference has made a HUGE difference to our nights. Sometimes i'd wake because he'd stir,i'd roll over, look at the clock (sigh! only an hours gone by!), drag myself out of bed to feed him.... and then he'd just kick and squawk and detatch and fuss for an hour or more before finally feeding and then sleeping and then repeat repeat every 2hrs.... Now I know better because he's so close and can tell better if he's just farting/pooping and wanting comfort or okay he's awake and wanting boob for food. Also, because he's snuggled and skin to skin, he's not getting so worked up over gas and just passing it with minimal fuss and settling himself back to sleep because I think he feels more comfort and secure - which has resulted in the 4-5hr sleeps!