drupal over joomla anyday.

you should be able to port your site to drupal with minimal work (granted you get over the learning curve, which is best done dissecting an existing theme like the default one)