Hi sentry1.
I feel your frustration.
I had the same issue but not any more since implementing the diode mod that I wrote up in previous posts. The noise is now 1/3 of previous levels and is now acceptable.
Although it involves a soldering iron it is a really easy job if you take your time and are remotely handy at diy. Obviously i can understand if your not keen to have a go though but worth a shot instead of the cost of writing off the whole setup.