Ian has given some great suggestions. I would recommend staying with XP as well at this point.

I have had good luck with Dell, not the cheapest or best, but good bang for the buck.

Here is a link to a Dell 6400 (15.4 inch screen) that is very configurable ... Login to read more.