There was an informal survey on here a few months back on what "type" of stutter people have. Repetition (the stereotypical kind you mentioned) was actually a minority of cases, with most being blocking. Some people, though a small number, selected prolongation. It sounds like you may have a mix of blocking and prolongation. In any case, you're not alone!  https://www.reddit.com/r/Stutter/comments/1bqi27u/what_type_of_stutter_do_you_have/