I too had terrible run-on probs with a heavier (6 kg/13 lb) prop. I switched to a Kiev (for lots of reasons, not just hard shut-downs) and after circa 200 shut downs I have never had a run-on problem since. When I was investigating the original problem my engineer swore that the prop weight had a direct effect on the shut down. I now have 2.5 kgs (5.5 lbs) less weight spinning on the hub.
Out of interest egp8111, what is your idle set at?