I think you are doing well and that you have a good plan set in place as for handling this situation. Have you had a phone session with Jody recently? I can't remeber if you ever did or not. I wonder what she would say about all this. Although I think you have it covered on your own for now.
Have a good time in Paris and let us know if he reaches out.
