@Lee is the router a standard (ie, not "audiophile") one? How did you ground it?I would like to add two I discovered recently.
1. Grounding the router.
2. Using a dedicated server over the hard drive in my MacBook Pro. Love the MacBook but it is quite the noisy beast.