I've been looking in to HH and i like there motors. i was thinking about a 35t for my scx10. so my suggestion would be HH. and yes a better ESC would be a good idea. i run the tekin FXR and i'm supper happy with it. you can connect it to you pc and tune it.
IMO i would only use the brushed for the crawler/ trailer rc's. i don't use brushless for crawlers so i can't recommend any. when i get a brushless it will be for my drifter.
for the metal shafts go MIP. you won't regret it.