I agree with you 100%. Additionally, I think it's effective to change our dysfunctional belief system: "I stop sending command signals to our tongue, jaw etc, if I am convinced e.g., as you said, when I get upset". Because if we change this condition, we won't stutter anymore since it's part of the root of stuttering in my opinion