Upgrades are never straightforward and take 3 times as long.
Its always better to back up your original data and install fresh.

If you backed up your original data, easiest is to rerun the cd and...