Hi. I suffer almost the same fate. My issue is mainly blocking rather than repeating although i experience both. I have almost complete fluency when alone or with inanimate AI, some trouble with my wife and child but they barely notice. It gets unnerving whenever i have to speak in public. At meetings, job interviews, restaurants, you name it. I practice a difficult word and speak out loud. I practice different accents and weights and speeds. I try to fit a word in a phrase so the group of words help push the difficult consonant out. I have trouble saying "difficult" or "different" because of the letter D. I still struggle with avoidance but i have no choice but to speak at group meetings. I find a cue card sometimes help. Just to see the written word and to read a sentence can get me through a rough spot.