If I were you, I would stick to my plans to transition if that is what I wanted to do and simply tell her that if she were to move in, she would need to deal with it eventually. I wouldn't jump right into ultimatums, those can be so damaging to any chances of working things out. Give her some time, but just don't waffle on your plans or she could see an opening...