I was a bit premature in selecting Drupal. In the end we have more experience with Joomla so we decided to keep using it. I will use Drupal for my own site.
Right now I am trying to recover our database for a new Joomla installation. It is taking awhile since the bandwidth is terrible today.