I'm not telling you what to do, and I don't think anybody should, but if you have already made a decision I'd encourage you not to make it take any longer than it needs to.
I'd also encourage you to look at your part of your interactions with him based on who he is today-- are you interacting the way you want to? Are you interacting the way you believe is right? Are you being the person you want to be?
Just questions. Take care, take what you want, and leave the rest.
Cyranoak