So when I first built this computer two years ago, I got an 850W EVGA PSU. It worked great until April of last year and it started making this God forsaken chirping noise, I bought a replacement EVGA PSU two months later and it worked fine...until now. The chirping noise is back, granted it's not as strong as the first EVGA PSU but it's still noticeable and very much annoying.

The PSU is fully modular, if I buy a Corsair PSU can I just swap the blocks out without messing with the cables? I'm not buying another EVGA PSU after this.