Absolutely the right way to deal with it. Trust in Him and you’ll know what feels right.
I have a problem with Anger. I’m not super aggressive or anything, in fact far from it. I tend to internalise it. But, it’s only when I lose sight of Him and start to pay too much mind to the wordly. I’m going to start saying His name in situations, as you suggested.