Cross each bridge when they come up. You should not worry about how to handle him coming back before he leaves.

For now pull back more IMO. Don't do anything to affect his decision and act as if you are fine with it.

R 25 years
M 14 years
S11 & S13
Working on it alone since Oct 2014
M in trouble a lot earlier (~2 years)
Feb 2016. 1st R chat in a yr.
Next R chat Aug'17
Still together