You must base your future decisions on where he is NOW. It's not fair to you, him, or the relationship to be setting up the relationship with expectations of a different person to emerge from your partner.
Deep down, you know the right thing to do, if you quiet all the chatter and reasoning and logic and FEAR, all the what if's. Quiet your mind or pray for guidance, then look calmly at the two of you. Are you truly a match? Deep down, you know.