McGregor is still the favorite in Saturday's UFC rematch with Nate Diaz. For all his new calm, tempers flared again.