I'm actually glad if Oliver's been confirmed as safe, not because I'd be particularly bothered if he died but because that throws my theory out of the window and I'd prefer to be surprised.
And having it be some random newcomer would be awful

It needs to be someone significant (even if it's someone I love like Bonnie).