With a new ally on his team, Oliver (Stephen Amell) engages Diaz (guest star Kirk Acevedo) in an epic final battle.