Transitioning from swaddle

My 3.5 month old is STRUGGLING transitioning from being swaddled. While swaddled in a blanket, he flails until he is busted out, or if in the arms up swaddle, he constantly moves his hands over his face and knocks his paci out. If he’s not swaddled at all, he goes straight for his face and scratches, grabs paci, etc. He does this on top of kicking his legs like a mad man lol. Anyone have any advice or product that has been a sleep saving miracle for ya?!