Ryzen 7 1800x is really not worth it, 1700 can be boosted to 4 GHz, the same as 1800x, it only doesn't have automatic overclocking and has lower base frequency. 2 GTX 960 are really good, you should upgrade only if they are not enough for you. If I will buy new computer, I will save most money...