In most cases, I think you'd be right to expect the anger to have subsided by now. However, you have a special case in that your WAW appears to have a legitimate disorder that may be driving the anger (rather than you or M). In that case, I think you just have to watch for it and if it starts to appear, exit the situation quickly...as gracefully as possible, but quickly.
