We wrapped DD#1 through summer with a singlet (sometimes without) and nappy and we used a cot sheet - but instead of bringing the bottom of the wrap/sheet up over her legs, we would tuck it into the end of the cot.

With DD#2, hates being wrapped but won't generally settle unless she is so we compromise and wrap her legs only and again tuck the remainder of the wrap into the end of the cot. When the temp has gone up, instead of laying her on the wrap and bringing it over her twice, we lay the wrap on top of her and wrap it underneath her so there is only one layer on top of her legs if that makes sense...again tucking remainder into the cot.

At night, we do still wrap her arms as well but have been wrapping her fist near her face as it seems that sucking on her fist is soothing for her. If we pin her arms, she fights, protests, struggles, wiggles and generally complains until she has fought her arm out and fist into her mouth.......so I just try and save her the time and energy Sometimes she still has a few restless moments over night as she stirs and bops herself in the head but she has started to resettle herself so I think with her its just been a case of getting use to those active arms!!

I'm not sure if any of that is helpful but hopefully!!!.....................