16 gb of RAM ddr2 will never run well on a modern game , so in my opinion u can change the ram and the mother board , witb the same cpu socket , and ddr4 chanells. Try to get some 16gb DDR4 3200Mhz or even 3600Mhz I wouldnt recommend u to get a GPU , the prices qre way to high , u should wait...