The one thing I would likely also change is that at the moment I have three monitors spread about landscaped, horizontally. If I was going to start with all new hardware I would get at least one monitor potentially all 3 that had the option or swiveling into portrait mode.
For what it is worth, I am currently considering a workstation from Boxx.
I hope this helps and if i get a chance to switch I would go with ThinkPad x1 Carbon
https://secure.newegg.com/wishlist/md/7519915 (I listed all the parts here, but I didn't buy them all here)
I don't really game.