[jholder]

Quite honestly, restoring would be your best option.

Follow the restore instructions in the wiki, and before you upgrade, backup again

it will probably fail, but when it does, you'll be able to get us the error and logs.

jh