If you perform an upgrade install, you're literally begging for issues.
Bite-the-bullet and perform a clean install.
Yes, it takes considerably more time up-front... but you'll know that you're good.
Time well spent...
When you're finished, create a backup image file of the boot HD... and you're set/safe moving into the future.