In case any one was interested in the resolution of this matter...

I finally got around to replacing my amp and all the bad noises went away