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.