Slowly but surely he's returning to you. You are doing great! It's difficult when you see them starting to "thaw", but you've got to continue to be yourself and do things that work for you.
I'm glad to see that he joined forces with you to help a friend out. Every step is a good one for the both of you.
Sit quietly, the answers will reveal themselves when you least expect them to. The past is gone, the present is a gift and you need to focus on today, allow the future to reveal itself when it is ready.
