So I ended up getting a bad unit from ebay and started experimenting. Came across your post on here and started trying different ceramic caps that I have, and one labeled 15 (probably 15pf). It fixed the problem enough to where the noise is barely noticeable. Here are before and after pics