Are we talking 2011 Djokovic? Because I would bet on him over any incarnation of Andre. Their ground games and returns are comparable but Novak's movement would give him the edge and he was stronger mentally than Agassi.