I wouldn't go black now if I were you. Although W flip flops on the OM, she consistently comes to you for validation, etc. As long as she is open to spending time w/ you and it is positive I say stay in the picture.
I don't get why she plans for us to spend so much time together - So much for being 'separated' I guess. I swear we lose 10hrs a week between us just driving around between each other's house.