crazydoc
Master Baiter
It's still a little hard to read the schematic, but it looks like C7 is 4700P, which would be 0.0047uF, and C5 is definitely marked 0.47uF on the schematic. C7 passes the high frequencies, and when you switch in C6(?) this would pass the lower frequencies, and I'd expect this to be a larger value. What value is C6(?), the one in series with the switch S4?
Since the supply voltage is rated at 33V, I'd expect that 50V caps would be adequate.
Since the supply voltage is rated at 33V, I'd expect that 50V caps would be adequate.

.) You could put the original C1 back in to see if this makes any difference. Next I guess would be to change the FET and see if that makes any difference. I can't see what the part # is on the schematic, but probably any 2SK170 type would be OK, at least to see if that made a difference in the noise.