I just replaced a power supply for a similar reason, a real pain. Although now with a new power supply my GPU's tend to buzz a little when they are under full load. Apparently it isn't an issue. The power supply on the other hand, shouldn't be making much noise.