Swaddling questions/sleeping probs

I'm not sure what to do with Colin. I still swaddle him b/c:
a) he sleeps best like that
b) he has eczema that bothers him at night and I put medicine on his head when he sleeps. If I have his hands free he'll rub his head and then end up sucking on his hands or gloves with the meds on them

Probably is he has been rolling for a while but never seemed to care to do it at night. Now last night he was desperate to roll - quite difficult in the swaddle, and uncomfortable.

WWYD? Plus, he's quite big for the swaddle at 5 months and likely 20lbs. So it won't last much longer.

He got up like literally 10 times last night. I'm a zombie at work today (but I did manage to do my 30-day shred video this morning )

HELP

Re: Swaddling questions/sleeping probs

I would wait it out until say Thursday night and then put him in the sleepsack that way the weekend is almost here and you don't have to worry about work. It may take a few nights of him waking up to get used to it, but once he does it should be ok.