Drupal vs Joomla; which one should I use?

Lately, I have been looking at the top two cms platforms: joomla and drupal. My speedcubing website, www.cubegeek.net , runs on joomla, but i am thinking about moving it to drupal after looking at some of the great features of drupal. Right now, my website is ok, but i need to redesign it to make it look more clean and professional. Drupal has a wide variety of themes, but less then the number of themes Joomla has. I think joomla is a good cms, but I feel restriced in joomla. The flexibility of the development of the site developer is limited. I wanted to add the ability to have user profiles, but that was a problem. I had tried community builder, which didn't really work. I test tried drupal and found out that you can have really clean url's like site.com/yourusername. It is very easy to do. Both Joomla and Drupal are great, but I actually prefer Drupal over joomla. Right now, useability in Drupal is a problem, so I will decide if I will switch to Drupal or not after Drupal 7 and Joomla 1.6 comes out. Things might change and I might change my mind as well.