I understand I'm just touching the surface here, but I think that in some ways as may have been suggested by 25, it may be time to change stuff up a bit.
While things are "better", there appears to be little forward movement. Since you can't change her... what can you do for you that might edge things forward.
I also wanted to touch on your W's comment after the "booze incident". Again, like 25 suggests, your W does appear to have her finger on the trigger. But I wonder about looking at the other side...
Might there be a reason why she thinks you have some issue with her? Sure, the apparent trigger was the "faces" you made around the booze. But that was her pulling the trigger and not necessarily the reason she thinks something is still not quite right and why she won't make more emotional steps towards you...
So what could you do to become a more open vessel for her to trust being more emotionally connected with?