Welcome to the forum and sorry you find yourself here.
A couple things first, break your post into paragraphs so we can read it easier. Also, put whatever pertinent info into your sig line.
Wow. Yeah, this will be tough, but every switch is tough.
WAS will lie about the level of contact, always minimizing it. And your W is feeling entitled right now because the line was crossed already by you.
I think you have done pretty well so far and have drawn your boundaries.
You could step back for a bit and breathe, regroup. Have your plan ready. This will be dynamic, of course, because her behavior will determine the plan.
Hang in there and don't be afraid to ask us questions.