6 months and still swaddling

Our LO is 6 months old and still swaddled for bedtime and naps. He takes 2-3 hour long naps and wakes up 1-2 times at night to nurse. Now he's up every 1 1/2-2 hour escaping from his swaddle. Leg comes out or both arms are out. He cries whenever he escapes and won't go back to sleep unless rewaddled. We currently use a miracle blanket which completely saved us a few Months back. He seems to have just about grown out of the miracle blanket. Anyone else still swaddle? Our guy does NOT want to transition and still seems to have startle reflex which immediately wakes him up or he's constantly poking himself in the eyes and awake immediately. He falls asleep within minutes in his swaddle.