swaddling - 6mths

I know there's been posts before on this but here's my dilemma.
DS won't settle without a swaddle - he's 6 months old! I feel so bad when I say my big baby boy is still swaddled.
Where we are his rooms quite cool so we are still swaddling in flannelet - it's got to be a tight swaddle. While away we were in hotter weather so swaddling in muslin - which he thought was a joke - got out of it in 5 min and wouldn't sleep!
He's just figured out how to roll back to front (and getting better at it every day) and I was told that's when you've really got to give up the swaddle as it becomes a hazard.
I've heard about pokemoes (sp?) but that wouldn't do as it's too loose.
So what do I do now?

Corban was waking 6-8 times a night at Isaac's age as was getting himself unwrapped and didn't know how to go to sleep without being wrapped so I was having to get up and rewrap him so decided enough was enough and went cold turkey straight into a sleeping bag. It took about 4-5 days, of practically no day sleeps and unsettled nights but I just kept telling myself short term pain for long term gain! Is SO much better now as I can put him in his sleeping bag plonk him in his cot and he will sleep however and whereever he wants...usually sideways across the bottom on his tummy with his bum in the air!

I should add that we went cold turkey, and it's taken the last week or so for her to get used to it, day sleeps have been a bit rubbish (nights were fine) but slowly improving there too.