Hetzner had an i7 6700 server in auction for the same price as my current one with an i7 3770 and with 4TB HDDs instead of 3TB.
I snagged it instantly because that's amazing so I'm going to be moving Synapse and Peertube to it.