I think you're pretty much on the money. Marijuana didn't affect my stutter too much one way or the other. Alcohol, say, 3 beers or so, makes me very fluent. Any more than that, and the stutter returns, but it's still better than when I'm sober. I also stutter a lot less around women, for some reason, and a lot more around my parents.