*hugs* I'm so glad you're back and you had a nice trip.
Now what are we going to do about this sitch with your W. Clearly, at least to me, she still cares about you. A woman will not come and clean your house if she thinks you're garbage! And, hmmm, you don't call her, so she calls you several times. Then you can back and she lets you give her lots of hugs. Nope, not exactly what I would call a woman who can't stand you.
My friend, I say this only because I care. If I'm out of line, let me know. But you need to decide if you're in or you're out. Like Bruce and Gabe have noted, you seem to be all over the place with your feelings for her. You say one thing here, but your actions with her are not living up to that. Being in this sitch is not a bad thing, but I don't want to see you cause harm for yourself.
I too see a lot of positive things between you and her from what you tell us, but I don't live in your shoes. Only you know how you really feel. But it really seems to me that what ever you're doing or not doing is having a positive affect on your W.