Just don't run PC Suite or the firmware updater until windows has loaded the drivers for the phone.

Plug your phone into the PC and it should come up with the found new hardware bollocks. Just wait for it to finish installing the drivers and it tells you your new hardware is installed and ready to use, and run the firmware updater.