Not to long ago I posted a thread about a new computer I'm thinking about building. Well I'm having drawbacks, and I don't think I'm ready to pay $1300 for a computer. I was thinking of upgrading my current desktop, so I wanted your opinion. Here is my current setup:

AMD Athlon XP 2400+ (1.8 GHz)
GeForce 6800 GS 128MB AGP
Asus A7V9X-X Mobo
1024 PC2700 RAM (2 sticks, 2 different brands)

I'm thinking about upgrading the box with this:
OCZ Platinum 2GB (2 x 1GB) 184-Pin DDR SDRAM DDR 400 (PC 3200)
Radeon X1950PRO 512MB 256-bit GDDR3 AGP 8X IceQ 3 Turbo HDCP Video Card (or maybe the 7950 GT, however I heard there are some issues about quality)
And a new fan for my CPU. Whenever I get into a game, my computer locks up because of the heat.

So which route would you take? I'm getting double the amount of memory at a faster speed, and a current top-of-the-line-mid-range graphics card where I can eventually run 2 monitors, whenever I get to that point in my online career, and play every game on the market (unlike now). Of course the new computer would be better, but would it be safe to upgrade 1 last time?