I had to go to the live rankings to see which head of hair you were referring to, as they are both pretty nice, though I know that much is made of Rublev's. Actually, on the live rankings, Stefanos also gets to a CH #5, and yes, the Russian will pass Roger. (Speaking of Roger, when is he scheduled to make his next appearance?)
As to the final, I'll be happy with either. The Greek has the more interesting game, though the Russian, while he does hit the snot out of the ball, doesn't come off as just a ball basher, (the way Khachanov does, and I don't care for his game, in general.) He plays with more grit and thoughtfulness than that. Either way, we have a new MS 1000 winner, and on clay. I'll be curious to see who wants it more, and whose game holds up under the pressure. Could be a great final. Hope so.