What's her head/neck control like?
I would try her on her tummy. Unwrapped obviously, on a flat surface, like in the cot of bassinet, no the bed.
Has worked with both of mine.

Have you tried using the Brauers Calm stuff too when she is really bad?