Comfort nursing/swaddling

I have an almost 4 month old and I’m worried she’s too dependent on swaddling/comfort nursing to calm down and sleep. I’m worried once she gets too big to be swaddled (we’re currently using a transitional swaddle sack with the arms out but in sleeves) and old enough to get through the night without needing to feed, that she won’t be able to sleep without those things and we’re in for a tough time. It’s already been tougher lately. She was in a Velcro (to keep her arms down) swaddle sack up until recently and every time we put her down in her crib she would wake up. It was a little small/tight for her legs, so I think kicking in a tighter sack woke her up. I think the suggestion is to stop night feeding around 6 months, because they won’t need to eat as much as they will be on solids, so I know we have some time, but I don’t want to make things harder for us down the road. Am I over thinking this? Will it all just work itself out as it should? I think babies still have their startle response up to 6 months, so she should be able to sleep more soundly by then and it won’t be so necessary to confine her movements. Sorry for the ramble. Thanks for reading. Would appreciate any momma’s experience with this transition :)