It seems we all agree about not discussing the MR right now. Don't be asking him what he's going to do, if he's leaving, etc. Although you may feel nervous and insecure, try your best not to show it to him.
I believe the best way is for him to see the work you are doing. No putting pressure on him. No breaking down in front of him. No asking him questions, but answer whatever he asks you. No fretting in his presence. These are a lot of "no's" but they are a lot of work to do.
I have not had experience with OCD, so I can't help you there. I have had depression most of my adult life. It doesn't disappear. It has to be managed with medication.
Did your first H leave you?
It is not about what you feel should work in your M. It is about doing the work that gets the right results. Do what works!