I still see Laurel as one of those gradual changes that line up with the comics at the end. He's already gotten the mask, a name closer to Green Arrow, and the sidekick. I know that success may push this series past the anticipated 5 seasons, but I can see them having Oliver end up with Laurel by series end. After all, those 5 years were a huge struggle for Laurel as well. She is on a journey just as much as Oliver has been, and still is, on one. She thought she lost her boyfriend (and potential future husband) as well as her sister and it changed her, and now to have her sister return and now die in front of her, it's definitely a lot to handle, and even though I agree that the writers may not have known what to do with her at times, I'm pretty sure they're pushing her to become the next Canary sooner rather than later because they need to find a way to bring her and Oliver back together.
I anything Olicity will happen, but much like in Smallville, they're not going to force a relationship just because the majority of fans want it. There were so many crazy Chloe fans that felt like she would be the real Lois, but one way or another, they made it so it worked out in the end for Lois and Clark. I can see the same happening with Laurel and Oliver.