And the Seven Slayerettes are............

Jock....................................Larry
Sheepy..................................Harmony
Stuffy..................................Giles
Dorky...................................Xander
Snotty..................................Cordelia
Witchy..................................Willow
Wolfy...................................Oz

And the answer to the Bonus Question is.......

The Slayer..............................Buffy Summers