Moved to "Site Builders"...
A more sensible approach would have been to have extracted a fresh tar into your site root, run the installer, using the same database that your subdirectory used. Then copy the mysite contents and themes into the new install.
Oh, yes You're right. I'll do that next time!
Thanks for the help.