Yes don't swaddle once your lo starts to flip. My lo doesn't latch to sleep but we used to put him in a zip swaddle and when he had to transition to sleeping with his hands out, it took about 1-2 weeks for him to get used to it and during that time he woke up more frequently.
I would suggest to put him in the sleep sack while he latches so that once he falls asleep you can just put him in the cot. He'll eventually get used to sleeping in the sleep sack.
Read more
Pint-sized mama of a little munchkin