Follow up:
Over the weekend, I worked on 2 of the Athearn CF7s and an Athearn GP35. I took them completely apart, cleaned everything, then put them back together piece by piece. As each piece was added, I ran the loco off a DC power supply, just to see where all the noise was coming from...