I have the exact same problem, and only have a database backup with no backup of the data directory. I ran step 3 twice and it messed everything up. So I thought I just needed to rebuild my thumbnails and it removed all my photos from the database. They're all still in the data directory with their new naming conventions but are completely disconnected now. How can I fix all this?