Since this is comparing both fighters at their primes, Castillo was easily the better fighter. I think he was a very underrated fighter his whole career.