Have you tried sleeping her on her tummy?
Charlotte had the exact same problem, then figured out she was a tummy sleeper! Lightbulb moment lol
So we swaddled her bottom half until she was about a month or 6 weeks old then gave up on that too and went to warm pjs, but the sleeping on the tummy solved the sleep issue, and she didn't have to be wrapped which solved that issue.

Check out Sleepy Wings - not sure when they are available though, but such a fabulous idea, could be helpful.