I actually agree that Connor may be the one that dies. Sexual orientation aside (I understand that gay people have died at a much higher rate than straight people historically but I think the notion that it can't be Connor because of that is absurd). If the story needs or wants Connor to die to move the narrative forward; that's what they should do.

I also think that it would be really interesting for Oliver's character to have Connor die. Oliver started out being so innocent. He's slowly becoming a bit more corrupt, but what would happen if Connor dies? That's a downward spiral I think would be interesting for the show to explore. Maybe there is no downward spiral, maybe it would motivate Oliver to be a better person. This is HTGAWM though so it's probably a downward spiral.

Given that Oliver ruined Connor's chances at Stanford (if Connor had gotten the email he likely would have gone and therefore he wouldn't have been at the house and wouldn't have died), I think Oliver's guilt and how that plays out would be an interesting storyline as well.

Annalise has been inviting everyone to move in/sleep over. Connor needs a place. I think it's very possible that we will see Connor move into Annalise's house in the next several weeks.