This is all part of the process .. push-pull ... come close-run. Remember have patience, you chose to give this to God right? Continue to let it be in His hands and work on you. Keep GAL, 180, and the PMA up.
I would point out if the OM being involved with the daughter has always been a hot topic issue and you both were able to talk about it without a fight you should chalk that up as a win. Keep calm, think big picture here .. heal and rebuild ... let God step in when he needs to.