Probably not. He hadn’t won there since 2008 and it’s not like he was losing to only Rafaole (in fact he never played Rafa there, lost to Nole 3 times post-2008) in those years. I think somebody would’ve probably got him at that point in his career, definitely Thiem would be the favorite if they met before the finals. If he somehow gets to the final then he probably would’ve beaten both Thiem and Zverev given they handled the moment horrifically and he’s an experienced champion but I doubt his ability to get to that final.
he’d be rolling over in his grave at the thought of his body being used to advance modern medicine