I had to play with my grounding too, but I can't remember where I grounded it... I think I added a ground going from the speaker wires to the antenna, in order to get rid of the whine, but as I said, my memory is hazy
Unfortunately, the whine is caused by improper grounding
It's a vicious cycle.