Sorry has taken me so long to reply, have been flat out busy!
Connor is sleeping through the night now, and still has two day naps of about 1 hr although can be less or more depending.
We just went cold turkey and decided to ride it out and see how long it took. It was in actual fact only about 2 bad nights and then it just got better and better from there.
Connor was the same as your little one and would wake when he unwrapped himself, but it got to the point of no return after he started crawling, he would end up unwrapped anyway, so I thought just gotta go for it.
We are a happy success story, my advice is go for it, as summer is just round the corner and it will be just too hot anyway.
Hope this helped,