I got the same answers as you, for when I was building mine. Since I was going to do a lot video and 3D render i decide to get the 3930K, and im very happy with that. I overclocked to 4.2Ghz, but put back on stock, just because I got some improvement but the power from stock wasnt letting me down.
Good you change to the newer platform, I would do the same.
I just check your build, I'm not a pro or anything but why go with the velocirapitor?? if im not wrong the 7200rpm will perfome just as good, have more storage, and with the extra money get a 5930K so you have all 40 PCIe lanes
And game well a i5 do just as good, but why the hell not have the i7 with 6 cores and 12 threads when need it.