Vaapad is not god, as Yoda uses what the general populace thinks of as an "inferior" form (Read: Ataru, the same form that got Qui-Gon killed to a Juyo user) and Yoda could pretty much school Mace in a pitched battle.
I don't think Vaapad is as good for saber-to-saber combat as some people are making it out to be.... I mean, Makashi is, in the definition by Nick Gillard (The bloody creator of the forms) the REFINEMENT of saber-to-saber combat. Meaning? The highest degree. Makashi is better. And since we never see Dooku fight a battle where he gives it his all and fights for real, I'd argue Dooku is the best Sith lord in lightsaber combat in the PT era. He'd destroy Mace and that's the end of it.
Well, it is. Why would a practitioner sacrifice the protection against blaster bolts and whatnot to be good at saber-to-saber combat, only to be passed by Juyo/Vaapad, which is, if anything, Niman on crack? And of all the people we see in the PT, Dooku most easily dispatches his opponents and keeps Yoda at bay while Juyo practitioners tend to be -in-your-face and Maul in particular takes a great deal of time to make a kill... (You can chalk this up to arrogance and playing with the two jedi, btu the point is Juyo and Vaapad are more open, kinetic styles that draw on the Force, meaning Force powers are actually a break in the routine. Notice you never see Mace or Maul really utilize the Force while fighting, whereas Dooku chucks stuff like it's his job.)
So yeah, when it comes to saber-tosaber fighting, the list goes like this:
1) Makashi
2)Vaapad (Completed Juyo)
3)Juyo
4)Shien/Djem So
5)Soresu (This is a close tie for fourth, as Soresu can be more tactically sound in lightsaber combat that Shien... However, it doesn't help much if the opponent is Dooku, obviously)
6)Shii-Cho
7)Niman