I have the same problems as you. What I personally do is to not make a big deal out of it and accept that it'll happen. The main thing I do though is make fun of myself, which then leads my friends to make fun of my stutter, which then gets a good laugh out of everyone. Hope this helps and good luck!