i'd go with an intel q6600, by the looks of your old computer u like to keep ur comp fairly lon before getting another one. so getting a quadcore will be better in the long run.
like ive been hearin intel's quad is way better then amd but since ive gotten so many different answers , u kinda get doubtful of wat to believe O_O lol