My moneys on things happening another way or two.
1. Ollie kills the dark Archer in front of Tommy who finds out its his father and sees Ollie as the Arrow. Vowing revenge he takes up the mantle of the Dark Archer and vows to destroy Ollie & Laurel. I like this one because the young actor is cheaper to keep around than Barrowman.
2. After a long battle between GA & DA where Tommy and Laurel are held captive both Archers are revealed to the captives. After more fighting Ollie is nearly beaten but Tommy takes the kill shot. Ollie then "kills" the Dark archer. Laurel conflicted tells Ollie she never want to see him again. Which gives us our angst for next season.
I'm thinking it's going to be more like your option #1. Though I don't think Tommy is going to find out that Ollie is the Arrow right off. I think it's going to be more like the Raimi Spider-Man films where you will see Tommy slowly becoming more corrosive about his father's death and vengeful about Arrow's involvement. Of course if it goes that route the show is going to have to show Malcolm treating Tommy with a modicum of respect and concern.