Which CPU is better? *+ another option!*

[HaxD]

Intel Pentium-4 640 - 3.2Ghz / 2Mb L2-Cache / 800Mhz FSB / socket 775 / EMT-64
or
AMD Athlon 64 3500+ (s939) / 2.2Ghz / 512Kb L2-Cache / 1000Mhz HTT

This system will be built for gaming, I don't plan on overclocking anything. I don't know much about hardware, so I can to the people of [H].

The rest of the system is:
2x512mb corsair xms ram
mobo depends on cpu obviously, either way will have pci-e
x800 gto2
aspire x-plorer w/ 400w psu

OR I can get a s478 mobo and use a celeron 2.4 ghz + that ram + that case + agp card (6800 GS), but how will this system perform with the 2.4? I'm looking to play games like counter-strike source, maybe quake 4, need for speed most wanted, maybe bf2. With the s478 I could always upgrade to a p4 3.2 ghz (maybe for my birthday ).

So basically, I want to know how the 2.4 ghz celeron would perform with the other hardware listed, and which is better of the 3.2 and the 3500+. Also which option you would reccomend.

Thanks

edit: forgot to mention i already have the hard drive (250 gb ide maxtor 16 mb cache)

 

[Mayhs]

amd 3500 any day over the other cpu...its a lot better and when you do oc it is a good oc'er too...
and for cs:s im sure a x800xto2 can play it at 1280x1024 with 4aa/16af with everything max