Upgrading PC for Photography

[MichaelJPhoto]

I currently have an i5-760 with a GTX 570. I am trying to figure what would be good enough to keep up with my workflow and be able to play some games in my free time.
Type of files I deal with are 24 megapixle 14-bit raw files which are very large and will only get larger over time (with 50+mp sensors coming out).
Would something like an ASUS mATX X99 WS mobo & 5820k be too much
or
Should I just go with a 170 board and a i5 or i7?
Also I am looking to do a RAID setup, not sure how I should plan it.

 

[logainofhades]

Given how long it appears that you keep your systems for, I would say 5820k makes good sense. It is also cheaper than Skylake i7.