A few things you can do to help eliminate your noise issues.
Add more earth Grounds to your machine, its common to have quite a bit of noise around your spindle motor, so grounding the case our frame may help.
Use twisted pair, shielded and foiled cables that are grounded on each side for noise reduction.
Check your Earth Ground to verify it is good, you do not want residual voltage there. If you have a bad earth ground, then it wouldn't matter what hardware you use, it would be less than desirable results.
Try a Ferrite Core Noise Suppressor, they're really cheap and the easiest to implement.