One thing I always liked was that crossbows generally had lower stat req to use...but with that gone....
I can throw in my confirmation about the concerns in this thread; at 3AP per shot, Crossbows aren't quite viable enough to be different-but-equal to Bows, even with their superior damage.
I strongly recommend that Crossbows be tuned to include their damage bonus with a few other perks to make them appealing; for instance, if Crossbows cost 3AP to shoot, had the same modest damage-boost that they do now, and also had +10% accuracy and +7% Crit Chance (or something around this zone) I would consider them equal to Bows for different reasons.
+accuracy & + crit & + damage would indeed make up for the lack of an additional attack
For staves,
Since spells don't crit generally anyway....I'd honestly just significantly boost their damage and focus on giving them better passives than a combination of any two wands.
Wands = utility + diversification in passives
Staves = high attack + high passives