Have you tried the Aussie swaddle? Directions are at the top of this forum. If you use a huge, thin piece of fabric like a bedsheet cut in half, it's really hard to get out of. It's tricky to master and takes some practice, but it works like a charm for little Houdinis!