Considering that Davila gave Pintor a tough fight, and Davila was an inferior Castillo, I'd side with Chucho by UD.
I don't think Davilla was an inferior Castillo, I think Castillo could just fight like that. He could also fight in many other ways, using his immense toolbox. Chucho was one of the most versatile, and skilled BW champs ever. I think he lures Pintor into the right hand often, and that stops Pintor from going into the rampage mode he showed vs Sandoval.
