So then do nothing. If she asked you to not have your buddy over then don't. That's just the respectful thing to do whether she asked or not. I know you can put yourself in her shoes, you wouldn't want that either, none of us would. So problem one, solved.
Second request....let her talk. Take notes and really say nothing. If she asks questions be honest and say "I can't answer that right now. I don't know what I want." Be vague. Keep her on her toes. She started this, and you can end it, but you need to do it respectfully and without game playing.
If you are done, then I'm with you. If you want to work this out, take it very very slow. If you want to pursue your new buddy, then completely break it off with W.
Hows it feel to have all these balls in your court?