I'm glad you are going to wait. I think it would really be best not to tell him until you can physically leave right thenThe thought of him spending days or weeks "working" you after you tell him really worries me.
I don't think he's going to go physical, though you never know. I have no doubt that he will pile on the emotional abuse.
