I'd avoid an SSD. For the money you've got, your better off getting an SSHD, with storage twice of that you'd get for an HDD and near enough the same speed as an SSD, if not faster (unlikely). I myself have 2x 2TB Firecuda SSHD's and an additional 4TB Barracuda HDD. You may want to focus more on your RAM. Theres nothing wrong with 8 but 16 is getting to a point where it is nearly mandatory. I would suggest DDR4 purely as it requires less power (voltage), has higher I/O. It may well even be worth saving a tad more, depending on sales and whatnot for a better Graphics card. The 970's and 1060's are rather cheap and are considerably better than the card you have at the moment, even though thats not a pressing matter.