Have you tried doing exercises where you show him how you'd like him to respond and practice it while you are both stable? I think this would be fair if you've changed how you communicate to him.

It may also help if you guys separate when either of you are triggered and go back after 10 minutes. Is he more reasonable later in the day?