Actually I'M now in a bit of a quandary
Vista SP2 improves Vista by quite a lot (even though it itself is only in RC1 stage).
Could be some interesting politics going on at Microsoft between Vista Development and W7 teams. -- Bit of competition always a good idea.
Maybe Vist will be going...