i have the same problem with Jack...he fights being wrapped..BUT can't sleep unwrapped...knocks himself out with his flayling arms!!!
maybe wrap with one arm out IYKWIM???