Don't let her dictate the timing and the whole agenda. Do what feels right for you, and what works for you, whether it's little things like how you handled the "mind if I shower first?" thing (excellent), or bigger D things.
You need to look out for yourself, as she obviously no longer has your best interests at heart.
