It looks as though you already meet the recommended specs, but my thoughts are:
Only upgrade to 4gb, 6gb is overkill IMO
The CPU upgrade is a good choice
I would think the 7950 GX2 would be good, unless you are running at high resolutions