No Swaddle

Our little one started rolling both ways about three weeks ago so we've stopped swaddling her. She used to take 2-3 hour naps and would sleep 8+ hours at night. Now we are lucky to get 45 minutes. Most naps are about 15-20 minutes. I've tried everything. Merlin sleep suit. Zippadee Zip. Love to dream swaddle. Sleep sack. Swaddle with her arms out. Nothing is working and it's not getting ANY better. And normally it doesn't take more than 10 minutes of rocking to get her to sleep. Now without the swaddle we rock her for 30-45 minutes and she usually wakes up as soon as we set her down and she realizes she can touch her face. Any suggestions or miracle solutions?! I'm soooo tired 😭