imo, that's a bit much to expect, don't you think? The former-WAS are still human and you don't really know what is driving his crabbiness unless you ask him, or confront him on it, directly, calmly, non-judgmentally.
Maybe he just needs to learn/practice new ways of dealing with stress, old habits die hard, at least for me they did/do. How can you guide him to that?
In the depths of winter, I finally learned that within me there lay an invincible summer. - Albert Camus
Uncertainty is the very condition which impels people to unfold their powers.-Eric Fromm