Playing around with wish lists on Newegg, I was looking for just the right build for approx. $2K, maybe a little over, but I do plan on keeping the same speakers, monitor (Dell Ultrasharp 2408WFP 24", Logitech Z-2300 2.1 THX Speakers), and possibly upgrading the keyboard and mouse (this keyboard and mouse is following this rig (DAS Professional S Keyboard, Kensington Wired Mouse), as it will be converted into a HTPC for the basement rec room).  Here's the build I have now:
 
Antec 900 ATX Case
Gigabyte GA-MA790GPT-UD3H Mobo
AMD Phenom II x4 955
16GB Corsair Vengeance DDR3-1600 (4x4GB)
Intel X25-M 160GB SSD
1TB Seagate 7200 RPM + 500GB WD Black
EVGA GTX680 2GB
Corsair HX620W 620W PSU
Windows 7 Ultimate x64
LG 8x Blu-ray Burner
ASUS 24x DVD Burner
ASUS Wireless-N Network card
Hauppauge Win-TV-1800 TV Card
 
While it did serve well over the past 6 years and about two or three upgrades, I think it's time to move on, and build new for my main gaming rig.
 
Here's the build I'm thinking of moving to come later this year:
Intel i7-4790K Haswell
EVGA Z97 FTW ATX Mobo
Corsair Vengeance Pro 16GB (2x8GB) DDR3-1866 RAM
EVGA GTX970 FTW
Intel 730 480GB SSD
4TB HGST Deskstar HDD
LG 16x Blu-ray Burner/LG 12x BD-ROM
EVGA SuperNOVA 750W PSU
NZXT Phantom 530 Full ATX Tower
Windows 8.1 Pro x64 (Pending upgrade to Windows 10 Professional, if there are different tiers of Windows 10)
Logitech G302 Daedalus Prime Mouse
RAZER BlackWidow Ultimate Mechanical Keyboard
ASUS PCE-N15 Wireless Adapter Card
 
All in all, I think that this should be a far better build for the upcoming year, and possibly into 2020, if I can help it.  If this build was able to last through the Windows 7 era, then I should see no trouble with having the proposed build for at least that same amount of time through the Windows 10 era (assuming that Windows 10 will last as long as Win 7 did).