Well....Tell you one thing. I learned the hard way. If he starts punching the wall in a FIT of uncalled for anger...YOU will be next. I waited until he broke my nose and tossed me around like a rag doll.
No one can tell you what to do. But from experience...it is a matter of time before he goes batsh@t crazy. My kids got to get a ride from the cops to the ER after mine. They don't bounce back ..I know you are trying to do one thing at a time ...Once you live in peace you will wonder why you waited. <3