Just my opinion, but it looks like you are definitely being played here. The sooner you file the D, the better. Don't make an ultimatum that you don't follow up on. It makes you look weak. You need to show her that you are nobody's backup.
Get your ducks in a row. File the D. Go NC with your W. Sandi is right. She's just biding her time until OM is ready.