I did Toastmasters a few years ago, which was always an adventure being the only one who stuttered in my club of 30. One of the tracks was how to give humorous speeches, which also including telling jokes and getting the timing of punch lines. What helped me most was always talking about stuttering and making light of it when possible. Because of that, my stutter was just accepted, rather than pitied.