I am looking at a computer to buy as my previous computer's gpu died. Hp offered to give me an 800 dollar voucher to purchase the new pc, which is the same as my last, with a slight cpu upgrade (i5 7400 to an i5 8400). I have about 100 dollars extra for any slight upgrades before I buy the pc. Upgrading to an i7 8600 is 150, upgrading from a 1060 3gb to a 1060 6gb is 100 dollars, and a 516 GB nvme ssd is 150 dollars. What should I choose?