This is the first full match by Novak I watched live in a long time. Because of his ritual of endless ball bouncing, I can watch him only from the recording with FF button ready when he serves. Even Rafa's procrastination techniques do not make me as nervous. But to my surprise, Novak cut his silly ritual to 10 bounces maximum, so he's watchable now. As I said on separate thread, Cilic now holds the infamous title of "bouncer" on the tour (ATP & WTA included). I counted 20 bounces (in 2 series separated by a long pause and a look at the receiver) in one of Cilic's matches before I turned off the TV. All I could do is to swear and wish him as many time violations as possible.
So, given that now Novak's routine is not the most hateful of all players, and what I've seen in this match, I started kinda be happy for him. So I give him the edge over Rafa in the final. Not on his level of tennis, which may or may not be better than that of Rafa; they look both impressive. But Rafa is more likely to suffer unexpected injury, like the one with Stan in 2014 that likely had cost him that title. I'm not a pervert to wish him such mishap but I'm just stating that Rafa is more vulnerable than Novak. If they engage in a battle similar to that of AO 2012, they are not 25 anymore but 31-32, so & their bodies could give up this time, then Rafa's body would likely give up first.
I'm no fan of either of them so I personally don't care, so the odds I'm stating are objective I think.