I'm like Tigger jumping on Pooh: Freakin' AWESOME!!!!
You have done all of us proud with your talk with W. Well done, baby!!
Now you really need to pull back, not be too available to W, ramp up your GAL. If W tries to kiss or hug (whatever) you, you just deflect and say "Please do not do this. You are not respecting my personal boundaries. I've asked you several times and you keep pushing it. I don't like it at all. This must stop."
W will try to cross it because she has enjoyed having the OW and you up until now. Be alert for those moves.