An upgrade is not the route to take. It leaves useless files on your system and can cause conflicts as you're experiencing.
Save all you Documents, Pictures, contacts, videos, music, etc to a flash drive,
Be aware, you will need to re-install your 3rd party applications.