Are you going to overclock? If not you can save quite a lot by not choosing 'K' suffix processors and 'Z' suffix motherboards.
Your original system has 32Gb of memory, 16Gb is more than enough.
Unless you like Blu-Ray movies you can shave a little off the cost with a cheaper DVD drive, although the higher capacity of Blu-Ray for backup and archiving might be useful if you're using the system professionally.
Going 6 core Intel is a waste for gaming, the cheaper 4 core i7s or i5s do nearly as well in games, but if you're going to use the system for applications that demand masses of CPU power the big hex core parts are the way to go.
The system linked by ps3hacher12 is a massively powerful gaming rig, that GTX980Ti/i5 4690K combo is a real game killer...Wish my pension payout would turn up so I can afford it.