Who was the stronger wizard: Dumbledore or Voldemort?

I know you could point to the end of the 5th book, and say that Dumbledore proved himself more skillful. But at the time, wasn't he using the Elder Wand?