It is going to be faster to merge in the last 6 pages of changes by hand. Revert (sans a few files) to DRUPAL-5 again and start over.