You certinly want to go with the Intel i7-4790k proc, it's quite a bit faster than the AMD Check out the passmark scores.
http://www.cpubenchmark.net/high_end_cpus.html
And for video cards:
I would go with the MSI GTX 960, the arcitecture changed significantly between the 700 series and 900 series cards and the 900 preform quite a bit better compared to their 700 series counterparts. Also Nvidia just to avoid display issues as much as possible. Some will tell you the AMD is ok, and it very well may be, but overall from my past experience with 2 AMD cards they ALWAYS had some annoying display issues as in manipulator handles wouldn't show up, normals missing etc. And with the new houdini viewport it's already riddles with random bugs, so if you're on the same hardware as most houdini artists then you can at least narrow down your problem easier if you should run into one.
Just some thoughts.