I was in a very similar situation. Munchkin hated the swaddle and refused it and it was okay cause she slept and didn't startle herself too much. But Nao is six months old and still sleeping in a woombie. She first showed signs of not wanting to be swaddled. She escaped a lot, even from my pro swaddling. She was like a minute houdini. She would actually keep herself awake trying to escape it!
So sleep was short and she was pretty cranky a lot. So I gave one of the Woombies a try. I swear the first night I put her in it, she slept peacefully. But she's really fidgety, if her hands are out she does something with them and it keeps her awake. Now she does like 4-5 hour stretches instead of like 1hour bunny hops.

I think the only way to figure it out is to try it?