Upgrade, and if that doesn't work as expected then I'll go ahead with a manual reinstall. Can't say that I've ever had any problems with upgrading, though.