I've always thought his return was a question of when, not if. I mean I wasn't surprised he came back for that cameo last year.
Tony being part of a story with Genie wouldn't surprise me. They've always been part of story together. I don't expect any awkwardness there at all.
Now Tony and Genie having one last romantic storyline? THAT would be a surprise. I'm not as pessimistic about it as some, but definitely it feels like a long shot.
But personally I do not want Luke back to rescue Laura from Ryan. Laura isn't a damsel; I think she needs to be the hero of her own story. I want to see Laura save everyone else from Ryan. I just saw the new Halloween, with Jamie Lee Curtis; that's the kind of Laura I want to see in a story like this.