Hi El Gamo,
I'm a fan of the Fireball Kid too, however, if he hasn't patched up the holes in his grappling game, it doesn't matter if he's in better condition, Diaz will beat him again. Styles make matches and Diaz appears to have his number. Besides the ground game, Diaz held more than his own against Gomi during their stand-up exchanges.

Let's hope that Gomi's been putting in some serious work to improve his deficiencies. I really would like to see Gomi knock out Diaz. While I respect Diaz as a fighter, he's a punk with a BS attitude who needs to be humbled with a serious beating...

Take care.