I think you're handling things great! But it still seems like you're really focused on him and fixing things with him. That's the big unknown and the battle is within his mind, so why not concentrate more on yourself and doing things that make you feel good?!
If I were you, I'd let him approach you next. If he does, then you should feel free to reciprocate, but don't always be the one to take the initiative.
