I suggest you go with this one, I replaced the 2tb hdd with a 1 tb, a 2tb hard disk will make weird sounds after some time and there's a higher risk of the hdd breaking, you could re-use your old HDD or buy 2 seperate ones. (I doubt you need more than 1tb)
I replaced the amd graphics card with a nvidia one, most of them have much better performance than amd cards plus nvidia gfx card produce less heat and require less power. The price is generally also lower. (if you compare performance/$) The graphics card can handle the games you want reasonably well. As the price is lower you now have money left for a better processor, a 4th generation i5 is the ideal processor in your case.