Well, I think the upgrade should just be another service pack to Vista. Anyway, I've got probably 2 years left on my machine and eventually will end up with v7 if not by choice then by default. So the pre-order fire sale is only until July 11. Then there is the question of the Laptop, if it doesn't make it for 2 more years, do I want to be running 3 versions of Windows (viewing station/XP, workhorse/Vista, Laptop/Vista.

Waiting for Roman to weigh in...