eMac
I've found the next computer I'd want to buy new, the eMac. Price needs to come down a bit, and it could do with 20Gb more storage, but it looks like a serviceable machine. And it wouldn't need to be FDISK'd on arrival like a WinXP machine would.