I think it comes down to the least of all evils.

I would say Dell. Build quality has been decent compared to other brands. You can still get a vanilla Windows DVD, at least with the corporate systems.

HP/Compaq are one company now. So is Acer/Gateway/eMachines. Lenovo bought out IBMs PC group, so there are some similarities.