First and foremost, I may wait for 2.0 anyways, but in terms of how the game is currently, I wonder the following:

I am currently running the following custom build:
Athlon X4 640 3.0ghz Quad Core (about between an Intel Q6700 and Q6800 in power for reference)
GeForce GTS 250
4G DDR3-1333 RAM
Intel X25-M G2 80GB SSD
Etc...

I'm mainly looking into bumping up the CPU or GPU. I realize in FFXI, the CPU was more of an important factor (never needed more than my ol' 7600GT back when!). Between my current setup, which would you feel could use an upgrade more than the other and why?

Thank you very much for your time and knowledge.