I think Castillo has improved more than Corrales, I see it playing out very similarly to what Castillo said.
While Corrales has reach, it has been proven ineffective of late.

Castillo takes some hard hits, but still KOs Corrales late