Stoning shouldn't disable anything but ally defending. Meaning stoning of a stealthed ally would be considered a waste.

I like your suggested changes. As a Hunter I'd say that even with the new change Surprise Attack @3CC would still not be that favourable, but arguably better than currently. Even though if it were to...