Reducing AC Motor Mains Line Noise

I currently have a AC pump (120V 2amp) that is generating alot of mains line noise. I would like to place a filter at the pumps plug but i'm not sure what would work best there.

Should I be getting a Line Filter like this?

http://www.delta.com.tw/product/cp/emi/general_two/download/pdf/DR.pdf

Or should I be looking at things like Surge Suppression \ Protection like MOVs when dealing with AC motors?

Do you know the frequency of your noise? Your proposed filter doesn't seem to suppress much below 100 kHz or so.

--
The Rugged Motor Driver: two H-bridges, more power than an L298, fully protected

I don't, is there an easy way of testing it?

The main reason I'm going this is the noise is making its way through a relay, over a optocoupler and into my arduino. It shows up as 2-4 volt swings on the arduino 5V rails when I power up or turn off the pump.

Yikes, that's not "noise", that's inadequate wiring infrastructure. Are you in an old house? Do the lights dim as well?

--
The Basic Motor Driver: simple, inexpensive motor driver for 1 stepper motor or 2 DC motors

It's a five year old condo and fully up to spec, its just a really noisy pump. Here is the background thread.
http://arduino.cc/forum/index.php/topic,118562.15.html

I removed the noise by using this circuit I had laying around:

But I think its overkill and just want a more "sized" solution.