Oh Sez, you poor thing. What a rough night.
I feel for you because I know that in a few weeks/months time I am going to be in that exact same position! And at the moment I cannot see how Laila is EVER going to sleep without it. As it is now when we wrap her she sometime manages to sneak out an arm, and when she does this then there is no chance of her going to sleep by herself as she fusses and rubs her eyes until she cries, or if she has a dummy during the day she wacks it out then wants it again..it is so frustrating.
All the sleeping bags sound like good ideas and maybe if we find the right one for our bubs then losing the wrap is possible!

I really hope that Nicholas starts settling beautifully without it in no time at all matey

Sorry for the unhelpful post!