If you get AMD you definitely have to get Socket 939...
Personally I think you should go AMD, but I'll honestly tell you I'm biased towards AMD. I think Intel just brainwashes people with high numbers and throw in things like 'NOW FEATURING HT TECHNOLOGY!' in their commercials which most people don't even know....
I could sit here and say my butt has F-A-R-T Technology and it makes it sounds more 'technical'
AMD is less known, has NO marketing like Intel does and are still coming up. The demand for AMD is higher and (although I'm sorry I lost the link) I read an article where Intels marketing share has dropped about 20% and AMD coming up.
Unfortunately microsoft won't release a 64bit OS until Intel releases a 64bit chip (which if they weren't so busy brainwashing people and advertising they should have already done it) so really AMD is ahead of the game.
All in all though, that AMD processor you linked would KILL the Intel Processor you linked so performance wise in this case especially that 3500+ would wipe the floor clean with that Intel