We were wrapping Harlee till she was maybe 5 months old, thats when the weather started getting warmer and we just wrapped her in a light sheet, she would easily get out of it so eventually we just stopped re-wrapping her and she got used to it.
We never noticed her rolling while she was wrapped though, it was just too hard for her.
Hope you figure it out soon