sorry but i think that since you are already doing so well, you are setting yourself up to think that it will be so much different once he gets back in. i've been on this roller coaster for 21 yrs and its only gotten worse. unless he's totally commited to recovery, what you had is likely more of what you will get. rehab is not a cure all and relapse is so common with addiction.
on the other hand, i've been clean for a few yrs, but for me, i still have to be cautious and aware, commited to working a good plan of recovery or i'm sure that a relapse is somewhere waiting for the chance to raise its ugly head. i think the choice is yours but my suggestion to you would be for you to continue to take care of you, maybe you could go to alanon or naranon meetings for you. keeping you and yours in my prayers