I would definitely say you have made some very positive steps. I would help her with the race but try not to bring up R unless she does or if you are relating it to something like the service. I have a feeling she may say something at or after your class tomorrow. So far you are saying all the right things. In fact, I may borrow a few lines from you!!
I am in a similar situation but H stopped D. We are separated but talks have started for him to move back. I am very cautious because I am worried he is not ready.
M 48 H 50 M 25 T 27 D 20,18,15 6/11 H filed 3/12 H dropped 4/12 H moved out