Sounds like you are doing pretty darn good.

At this point I don't think I would bring up A unless it continues.

He may feel guilty enough and is trying to make it up to you.

JAK

You don't get to choose how you're going to die. Or when, you can only decide how you're going to live now. ~Joan Baez