Ditto to both of these.
I don’t think there could have been a good resolution to the situation, but I’m glad to hear that your good relationship with her seems to be intact.
Your journey probably isn’t over but, if it means anything, I think you are on the right path.