Okay I've thought a lot about how I would do the Tom King Best of the Best style Black Canary vs. Shiva fight (whilst keeping as much of the original idea in tact).
Main thing is that I would change the training line up. In his version you have Wildcat (Ted Grant), the original Black Canary (Dinah Drake), and Batman training her. And while I love her JSA links getting a shout out I have no idea why Batman is there except for the fact that both King and DC think Batman has to be everywhere.
If I was to redo it I would have the lineup instead be:
- Dinah Drake and Ted Grant
- Connor Hawke
- Cassandra Cain
So partially this is just because Connor Hawke and Cassandra Cain are two of the best hand-to-hand fighters in the DC universe who have previously and fought and held their own against Lady Shiva.
But also they also have more thematic significance. Along with Grant and Drake represent the key superhero groups that Dinah has been part of and shaped throughout her superhero career. Drake and Grant representing the JSA who raised her. Connor Hawke representing the Arrow Family she shaped. And Cassandra Cain representing the Birds of Prey she co-founded and her future as a hero.
(She has also been JLA/JLI and you could fit Batman in for that, but I would argue that she is the premiere hand-to-hand fighter of the main JLA cast over him)
Not only does this provide a good showcase of different chapters Dinah's story, but it also highlights the importance of her role in the DC universe as a teammate and often a team leader. Also it allows the people whose lives and heroic careers she's shaped to support her in her literal fight for the top billing as a solo act as she strives to become DC's Best of the Best.