So I tried a new strategy this weekend.
After bath, massage and bottle I've been putting her down in her room without a swaddle. Within moments she fusses, rolls over and is OUT!! She's been sleeping for 6 hour stretches now.
Everything I've read said its not a concern if they are rolling over independently.
M's been sleeping on his tummy since the day he's born but I still don't get 6 hour stretches. We actually had them at the beginning, but then he learned (at 2 mo) to roll to his back, and would do that and wake himself up. Now he can roll both ways, but he doesn't roll himself back to sleep. He also likes to turn onto his side to sleep too. Mostly he loves sleeping on momma.