Dead x58 build suggestions wanted

xombie2000

Distinguished
Apr 26, 2006
109
0
18,680
My EVGA SLI x58/i7 920 System finally died. I'm looking to replace it. The motherboard is covered under warranty and will be most likely be replaced by a z170 or x99. I was trying to decide on the rest of the components. Parts so far:

M.2 Samsung 850 EVO
Corsair Vengence DDR4 16GB
I5 7600k
1060 GTX 6GB

Could anybody suggest some alternatives? I do web development and my son games a little in 1080p.