Swaddling arms out when they start rolling over

Li
Did anyone transition from swaddle blankets to arms out when they start rolling or were 6 months? I really don't want to but obviously want what's safest. He sleeps terrible unswaddled though. He hits his face and pokes his eye, knocks his paci out. He wakes himself up constantly. Any advice?