Website Upgrade to Drupal 7

Over the past few weeks I updated this website from Drupal 6 to 7. I'm still in the progress of fine tuning the theme and some content, so there may be some minor inconsistencies in some pages. About 6 months ago I tried to upgrade from 6 to 7 but found that I needed to do a lot of work to get the theme in Drupal 7 to match what I had before. So I reverted back to Drupal 6. But that created a problem because when I reverted back I did not correctly update the Drupal database. So when I came to try the update from 6 to 7 again, it failed, i.e. many errors in the database upgrade. The end result was I had to load an old backup of my database (from 6 months ago) and then manually enter about 20 pages and 50 comments. I think it is all up to date now. Problems like this make me want to forego Drupal (or any CMS) and create plain HTML pages ...