Sounds like you're doing everything right.
You're being attentive, reflective and assertive while still being very humble.
Sounds like she doesn't know what she wants (simultaneously commenting on the space you've given her while responding in frustration and continuing to take space). Sounds like she must be smoking hot, because from this vantage point she's the one getting the long end of the stick here.