I thought the set-up to the fight was pretty terrible, but oh well, that's done. Same with Oliver's death itself, I don't like it much, but of course they must have planned how to get out of this so I'll wait and see. I hope they don't Lazarus him for no reason... though Malcolm or Thea could be the one to bring him to the Pit with the right build-up. Either way, that death feels like they simply wanted it to happen just so that they could get to the part after it and then the revival. It took so long to get to it (until suddenly Ra's finally decides to come out), and it felt so bland and dumb.
Judging from the titles of the upcoming episodes,and how Guggenheim says Arrow will be completely different for a time, I'm under the impression that Oliver will stay "dead" for a few episodes and we're going to see a bunch of other heroes crawl out - very likely Wildcat, hopefully Atom, and obviously Black Canary, until Oliver's "Return" (title of episode 14) along with the Malcolm-centered episodes that Guggenheim also talks about (yay).