I think you should make it clear that you are not going to be "given" rules to live by,
and that he'd better learn to deal with it while he has a therapist to talk it through.
free, he obviously has many deeper issues about control and insecurity which may not be alcohol-related.
Unless these are addressed, your life with him may not improve or even get worse when he isn't drinking and all he has to "do" is control you.
I know you are thinking about this and I believe it needs to be put on the table because if he's going to pull that crap when he gets out, where will that leave you?