Ahoy - Please think seriously about what I'm going to say, because I am genuinely worried about you.
Please, please go and read some of the threads from women who have come out of abusive relationships, and do a little reading on emotional abuse. The situations that you have described and you OH's behaviour are not normal. You might have got used to it after so long together, but please please understand that it is NOT normal.
Drinking that amount in excess is a drinking problem. Not all alcoholics are the stereotypes of reaching for the bottle every morning, or being drunk the entire time. Alcoholics simply can't control their relationship with alcohol, and this absolutely fits the behaviour of your husband. The fact he can go months without drinking doesn't matter. The fact is, when he drinks, he cannot stop. He cannot exercise self control, and that is a drinking problem. You have spoken to him about this, and it has changed nothing, because drinking is more important to him. It's a sad, cold truth, but it's the truth. The manner in which he treated you when you were locked out the flat is flat out unacceptable. That is an understatement. Imagine you have a daughter. Now imagine in a number of years time that her partner treated her like that. You would be livid with rage. Don't treat yourself any differently.
Abusive people can often try and "hide" the fact they are complete arsefucks by blaming it on alcohol. It's easy to say "I was drunk!You know I would never do that sober!". That's not what alcohol does. And I think deep down you know that.
You mention that during rows he has pushed you. That is abuse. No man, NO MAN EVER has the right to lay their hands on you. Pushing, hitting, kicking, it's the same thing. Pouring water on you? That made me furious. How degrading can you get?
You have said that you need to modify your own behaviour to prevent "things from escalating" (not drinking). That is not right. That is a huge trigger as an abusive relationship, and combined with the other things...
Please go and stay with your parents, or leave, or do something. But please do not stay with him right now.
Here is an anecdote for you. A real one. One of the most charming, "adorable", friendly and generally wondering man that my parents had ever met was a man we will call....David. David was married to a friend of my mothers. He beat her for YEARS, but only when he had been drinking to begin with. Then he started drinking more and hitting her more. Then he just stopped with the drinking excuse and would beat her stone cold sober. She stayed with him because the rest of the time he was so wonderful, and whenever she even raised a slight concern about the relationship people would say "but he's so wonderful!".
She left - years later - after he hit her daughter. Iin fact, she smashed him over the head with a lamp as she was worried he was going to kill her daughter.
Do not turn into this woman. Please.