If you want to make enemies, try to change something.
Stonewall needs to beat HH. It will do when fixed. I also think I will have HH work as Str -5 instead of a Str roll, then ignore the -5 if using a PF or MPF ... so its not quite so good when using naked fists.
I mean if the HH and stonewall rolls were both passed, the stonewall effect would be enacted