I know the hardcore Olicity fans were pissed yesterday after what Guggenheim said regarding how he regretted how they handled the pairing last season. So much so they got a hashtag trending in response to show their anger and to keep backing the pairing. I can only imagine how mad they were last night.
What's being slightly overlooked is that the dream world showed not only that the characters wanted all these people alive again or different things out of life but for Ollie his possible ideal world was him marrying Laurel and being with her not just her being alive up to the end. With Katie Cassidy set to appear across all shows in some manner, maybe Siren, or another version from another Earth or just brought back from the dead I wouldn't be surprised if they finally pushed the canon pairing between the two and not stray the way they've done so. I like to imagine a combination of the bad job they did in season 4, which they're openly admitting to now, and some instruction from higher up (maybe Johns) they'll bring the relationship aspect closer to the everything else Green Arrow related. Especially since Arrow is the only Green Arrow related property that tried to go against the pairing and suffered for it.