Just a few observations ... maybe a small 2x4 ... but you know sometimes it helps when someone else sees something in your sitch .. however small it may be.
So, the OM thing ... you can not do anything about that, except what you did, stating your boundaries and now you must hold to them as hard as that is .. the thing that I noticed was the time frame ... read enough around here and you realize all these A's die a natural death as we work on ourselves ... the time fram is really close right? If she values you .. you detach, do your thing, and now you have the cards ... she will have to prove to you the OM is gone, full transparency ... so you can both move in the direction of R if thats what you both want. ..... This may mean you have to move out just to prove you are serious ... my sitch .. she moved, but now seems she has found herself alone and I was real close to dropping the rope last week and again this week .. she keeps testing me now like a child and I have held my ground ... even thought I would love to just hug her .. I cant just yet .. not till I am sure we are past that point of limbo.
Anyways ... my point .. the OM may be on shaky ground .. but she has to end it ... you can't no matter what you do ... you have to be that better choice ... she still looks like she has a decision to make.