I deal with it by not substituting words. I stutter on the words I want to say. That said, working on blocking is very difficult and I'd recommend find a good speech therapist who knows how to work through that. But trying to avoid all stuttering was not the answer for me.