Id definetly have preferred Rafa's half. But maybe Andy has a better chance of winning a semi-final versus Nole than a final. Whatever of he gets through to the final this time he should not lack confidence.
Either way it's the big 3 he has to beat (although I wont be surprised if Rafa is an early victim) in the end at some stage.
Somehow I think there may be one or more of the rookies coming a long way, Tomic for instance, more than Raonic.