Perhaps you should give fedora-upgrade a try. It's a wrapper script which automates the various steps described at https://fedoraproject.org/wiki/Upg...