I would definitely start out a dog that may be a safety issue with the leash. I do feel that the dog can figure out what the stim means in the absence of the leash.
For the dog running to you to resolve the stim, I think a session or two with a back-tie or something similar may help. I agree with you on you points
E-Dog - 2012 WPBTCA National Championships
The time when screech owls and Bandogges howl and spirits walk and ghosts break up their graves.
Act I, Scene IV of William Shakespeare's "King Henry VI"