The symptoms kind of morphed over time. Eventually it got to the point where it would just lock up, but not reboot.

The old was a Cooler Master V1000. The new one is a Corsair RM1000.

To be fair, I also swapped out all the power cables, just in case. So there is a chance that one of the cables was the issue and not the power supply itself.

So the computer I purpose built for the Ashes of the Singularity Beta is finally good to go, a week before release, and right as class started back up so my free time disappeared again