Juyo vs. Vaapad?

In the Hero's Guide Sourcebook they state these as the benefits of Form VII.

Prerequisites: Dexterity 13, Force-Sensitive, Combat Reflexes, Dodge, Mobility, Improved Critical (lightsaber), Jedi level 7th.
Benefit: When confirming a critical hit with a lightsaber, you gain a +2 bonus on the attack roll.

Is this the Juyo Form or the Vaapad Form?

The way I understand it is that Juyo has always been there under development, and then Mace Windu later "finished"/"expanded" it and named the expanded version Vaapad, which is really a state of mind rather than just a lightsaber form. Is that more or less correct?
So I'm guessing that the Form listed as Form VII in the Heroe's Guide is Juyo.

Does anyone have any ideas or official rules on Vaapad?

 

Vaapad: Developed by Jedi Master Mace Windu, Vaapad is a dangerous combat style, both for the Jedi and their opponent. Master Windu developed Vaapad in response to his own weakness. It takes the Jedi Master very close to the Dark Side of the Force, passing within the edge of shadow. It's agressive strokes and crushing impacts hide the true nature of the Form. It is, in pure essence, a redirection of negative energy. The Jedi, in devotion to the Force, becomes a conduit for channeling the Dark Side back at itself without internalizing or adding to its power. It is both submission to the Force, and control of the Force by the will to do right. However, it comes at a high price, as the Jedi's emotional center must be completely focused and at peace. Anger, fear, and regret, even in the smallest measure, will create imbalance in the immense energy feedback, and the potential to use that energy is a grave temptation.

I was thinking that it should have the same benefits as Juyo but also with the following:

Every time a Vaapad user saves/avoids an attack from a Dark Side power (lightning ect), he gains a +1 attack bonus against that opponent for 1 round. He must succeed in a Willpower Saving throw DC 25 or gain a Dark Side Point.

 

i think that is pretty good, or what about an initiative bonus instead? i don't know, and after reading the epi 3 novel i didn't think about it that much lol,