I'm glad he's behaving a bit better...I know I've said it before, but the fact that you've been plunged back into the thick of it just makes me sick. I am very proud of the cool head you possess, and the wisdom you display in your choices.
I identify with the worry that he's just biding his time...that he thinks that he can get by with the least amount of effort possible. I so identify with it. I think it's a natural worry, something to tuck away and evaluate a few weeks down the line for sure, but at the same time, I think we need to be careful that we're not letting the resentment color our interactions.
I truly believe love is the answer to everything--not lay-down-and-let-him-abuse-me passivity, but love-him-as-God-loves-him charity. Sometimes I feel that the line between unconditional love and enabling is blurry. For me, the only thing to do is to close my eyes and listen to the still small voice inside...everything else gets to be too confusing.
((Hugs)) You are awesome, and you will be fine, regardless of final outcomes.