Whats the best way to upgrade to Windows 7 with a new computer

[richlevy]

My new computer is sitting downstairs unopened. I ordered my Windows 7 upgrade last week and I really don't want to have to install 3 times instead of the 2 I'm up for. I need to port data from my Windows XP computer to the upgraded Windows 7 computer.

Here is my plan. Let me know if I am doing something I don't need to do.

1) Perform initial setup of new Vista computer with 1 user account.
2) Let Vista perform all critical updates.
3) If no separate backup partition or disks provided by Gateway, backup C: drive.
4) Install Windows 7 upgrade.
5) Let Windows 7 perform all critical updates.
6) Add additional user accounts.
7) Install Firefox and Thunderbird.
8) Copy over Firefox and Thunderbird data files from XP backup.
9) Copy over Documents from XP backup.

The reason I am doing number 2 is that I'm not sure if the upgrade doesn't share elements of Vista and if I need Vista up to date.

I'm guessing 3-4 hours for everything.