Friend of mine had a woombie and her DS loved it. He was similar, needed to be swaddled but kept escaping, and the woombie seemed to do the trick.