I'm going with Margarito over Cintron, again.

Obviously, Cintron is better and more mature this time around, but it's not like the last fight was remotely close. What I mean is that Cintron would have to be 3 times the fighter this time around that he was in their first bout, and while I do realize that Cintron is better now than he was, I just don't think he's that much better.