I have had the same thing, but in recent weeks we've had a real breakthrough.
I have found that slowing my rising helps, so does squeezing up and in with my thighs, and also sponging on the reins and then giving when she responds. ALso found that the shorter I made my reins, the worse it got, so although it feels so wrong at first, lengthening the reins may also help.