I can't decide.

I'm sorry I know I hate reading questions like this.

My two options so far:

iMac 24"
2.33GHZ
RAM to be sold and bought elsewhere, amount undecided.
7600GT GeForce
250gb HD

OR

MacPro, with my cheapish 22" AOC Widescreen.
2 x 2.0GHZ
RAM to be sold and bought elsewhere, amount undecided
ATI Radeon X1900
250GB HD

My issues:
My 22" AOC screen is alright, but not great. Are iMac screens HD?
Also, is MacPro RAM expensive when bought from a non apple source?
Is 2 x 2.0GHZ Processors better than 1 x 2.33GHZ?
Is ATI Radeon X1900 better than 7600GT?

I feel I should buy the MacPro to give me longer life with easy upgrades etc, wheres the iMac is limited to 3GB Ram and limited upgradability etc.

Cheers for any suggestions or advice.

For longevity, the MacPro, since its heavily upgradeable. The real question is how long do you want the machine to last , and do you think you'll use the quad-core power to its full extent during that time.

Also, wait till after WWDC's keynote (Tommorrow morning, 10 a.m. PST), rumors have floated heavy about the iMac getting an update there, and being a professionals conference the Mac Pro might get a significant update. Its last update was the introduction of octa-core xeon, but some have discredited this as a actual update to the line.

Agree with Nicholi here- whatever you do, wait until after tomorrow's keynote address so you don't miss out on any updates.

Of course, the annoying thing is, it's already 4:30pm here monday, (I'm in new zealand) and the wait is killing me.