So update on this machine. It survived the year without too many upgrades.
This year I'm coming with a 970GTX. 2 months after I got my 960 I found that they released a 4GB one soon after my original buy and I was starting to get games that benefited from having 3GB or 4GB due to increased texture sizes. It wasn't many but it was enough. The 970GTX is from the same manufacturer as my last card and the same line.
I also installed a 4x 2.5" bay in the 5.25" slot and filled it up. It holds the original SSD which is still in active use for booting and running 3x 2TB drives in a Raid 5 configuration. I switched all the ports to hot-swap mode so I can disengage a port if one drive goes bad without rebooting the system. The bay itself is hot-swap enabled so it is safe and I verified it already before building the array. Effective 3.63TB.
The power supply was swapped with a slightly shorter model. I kinda wish I had gotten this one originally because it was also cheaper than my original. The main reason for it though is that the new one is 100% modular (the other was only semi-modular) and so I was able to get cables better for the job. The brand is silverstone and I also got their short cable pack so that I didn't have such long lines in there. It only has cables needed for the system build.