Canelo.
He is the superior and more skilled boxer.
Also, being more versatile I think he'll better be able to adapt and make the necessary adjustments.
As someone above said, boxers generally do better in rematches.
He just needs to work on his conditioning.