I heard that a parent need to stop swaddling when baby starts rolling to avoid risk of SIDS but, did any of you still do it?

My baby won’t sleep if she’s not swaddled.

We are guilty of using the rock and play for night time, I know it was recalled but it was for a while the only way to get her to sleep longer. She would sleep right next to my bed though and I would be very vigilant all night. Some nights we would put her in the bassinet but she wakes up more in there.

Since she started rolling I’m more concerned and decided either (1) not to sleep her in the rock and play without being swaddled (since it seems more difficult for her to roll while swaddled in an incline position) or (2) not to swaddle her while in the bassinet, just sleeping her on her own (since the risk of SIDS would be bigger if she had no hands in case she rolls). But we tried this method and it’s just not working, she keeps waking up stuck on her side or on her tummy and crying for help since she seems to hate that pose.

Now we don’t know what to do to get her to sleep stretch til 4 or 5 am again 😫 will it get better?