Soldato
He needs to seriously work on his ground defense now though as everyone knows it's the easiest way to beat him.
Indeed Diaz is a master of taking the back for a submission, he knew that and literally gave him his back. As someone who practices BJJ myself, Mcgregor made some alarming mistakes. His ground game needs drastic improvements.