We have the same problem and what we are doing is working atm (touch wood)

We use a sleep protection thingie ,where they like in between and has two cushion like things on either side to help stop them rolling,DD can only settle wrapped ,we have tried her in sleeping bags but she thrashes everywhere.
what we are doing is for a week or so we have been wrapping her but keeping one arm out ,then next week we will move onto wrapping just under her arms untill we will just pop her in a sleeping bag and hopfully she will be ok