Sorry to bring this back from the dead, the culprit was a POS power supply. I just replaced it with a decent 500W supply, the fan is a little louder (not enough to matter), but no more of the stupid electrical whines I kept hearing.
The sound was being driven by the CPU, I guess the old supply...