I went with the Athlon64 3200+

Just to give an idea of the improvement that yielded- my 3dMark05 scores went from 3dMark/CPUMark of 4367/2206 to 4904/3887. I'm obviously seeing big jumps in gaming framerates as well- Battlefield 2 has gone from the 20-40fps range to 50-70.