I think you're doing the right thing by letting him "tell you" when he wants to wrapped and when not. It will take a while of getting used to not being wrapped.
Are there any other ways of making him feel "cosy" in his bed? Like what LoriRae suggested? Or maybe just a rolled up towel next to him?
Sasa