You mostly nee dot look at your upgrade options.
AM3 (AM2+) a.k.a Phenoms are coming out fairly soon, and any current AM2 socket will support them, and the AM2 chips are darn cheap as well for the performance you get (High price to performance ratio) with no need to overclock them for great performance.
Intel chips (right now) lead the market in terms of speed and power, the only advantage AMD has is the Memory Bandwidth, which for a comparable comparison, the e6600 vs. the AMD x2 6000+ with decent PC 6400/DDR2 Ram... the e6600 may pull about 6000 megs bandwidth, as opposed to the AMDx2 6000+ giving 10,000+ bandwidth..
This may be very important in the upcoming graphics processors, especially when the phenoms are released.
In short, if you are looking for somethign at the end of next quarter give or take, you have to decide if you want more power now, or lots more power later.. hence, intel now, phenom later.