Anyone else still swaddling?

Is anyone else still swaddling their 6 month old? My son is huge (22 pounds) but still sleeps so soundly when swaddled. If so, what swaddle do you use? Is there a Velcro swaddle that goes up to 20+ pounds?