And know, too, the more you pander to avoid the fights, the more likely the fights are to happen because he will expect more and more and more (I am assuming the actions you describe and fighting are a constant norm and part of his personality, not just something brought about by the recent house stress.