My advice, if you must buy now, is switch to Intel if you have no social or legal gripes against the company. If you really want AMD, then wait for 45nm Phenom and then decide. Personally, I think your current CPU is just fine, but if you need the performance now, then an Intel motherboard that can accept a nice 45nm quad down the line is a good idea.
Never buy anything at the end of it's lifecycle, unless you have to go budget (ie don't get a Q6600).
Never be the first to buy untested tech unless you thrive on the risks of early adoption (ie B2 Phenom).