I've had some discretionary income and finally decided to upgrade. Ended up going with socket 1151 and the new gen i5. Went with a more expensive mobo in hopes of OCing a bit and supporting DDR4 3200mhz.

New Parts:
i5 66000k
Asus Maximus Ranger VIII
16gb DDR4 3200
1000w Rosewill Hive Modular PSU
Hyper 212 EVO CPU Cooler
2 x 120mm Corsair Air Quiet Edition Case Fans
Old Parts into new build:
AMD R9 280x
1TB 7200rpm HD
240gb SSD
DVD/RW
Blu-ray/RW
I have an old Fx6300, 8gb DDR3 1866, 635w PSU, and a random Gigabyte AM3+ ATX mobo that I'll eventually make a 2nd build from as an HTPC. Next upgrade will be a GTX 1070, bigger M.2 compatible SSD, new case.
I'm in the middle of 5 x 12hr night shifts right now though, won't finish putting everything together for another couple of days ;(
This post was edited by Mitchymo on May 20 2016 06:11pm