I don't disagree with your reasoning. It definitely is a good idea to create a life that works for you that is not contingent on W's all-over-the-placedness.
I would urge you to resist labeling every possible action W might take as selfish and controlling. Like you said, you love your W. You would like to reconcile. So, just try to keep an open mind.