I'd go Nick. Diego hasn't got much better since then. Nick has.
I think they stand up fights more often than they did back then. Diego would get owned in all exchanges and Nick would tie him up on the ground. Depends what the judges see.
I would go Nick Diaz all day though.