Remove and reinstall are not an option at a gig where there is no internet connection and even if there is a connection theres always the fear of the dreaded "already installed on 2 computers" message (although rare, it happens and murphy's law dictates it will be at the worst possible moment
)
I would set a restore point
before the upgrade
and after the upgrade when you are sure everything is working OK.
Don't rely on the restore point that windows automaticly creates when you upgrade. It's been my experience that windows doesn't do it until after the upgrade has begun - which means the install program has already removed the prior version, but not yet installed the new version - which kinda leaves you in a bit of a never never land.
Sam