I'd go with the 3800+. It's an investment for the future that way you won't have to upgrade as soon. Also I advise that you get a PCI-E mobo and spend a little more money for another GPU. I know there isn't much of a performance difference, but it is nice to have something that is more presently used in case if something were to go wrong.
__________________
XPS M1530
|