With Zoe- I transitioned to the sleep suit with the separated legs- found them in best and less.
Only did it because she could get out of her sleeping bag.
Is this an option?

Or could you put him in the cot with blanket/s short sheeted and tucked in, so he's still "cosy" ?