I have a good feeling about this situation. As bad as things are there is a high level of functioning going on between you and W- at least it seems that way from reading your posts. I think there is a lot to "work" with.
Her changing jobs would be a huge step forward- is that even a possibility?