Good for you for finally taking a stand. You're doing the right thing, and exactly for the reason you state at the end of your post!
I would NOT anticipate your husband will take your ultimatum seriously, just based on your past experience with him. You should plan out ahead of time what you are going to do when he violates your boundaries, because I fully expect him to.
