If I can suggest anything, it's seeing a therapist. Not a speech therapist, but a regular therapist. I have been seeing one for the last 8 months and its been hugely helpful. So much of our speech disfluencies stems from anxiety and negative self talk. Get a handle on that and the speech will improve.