I know he's in another bout, but to me Delvin Rodriguez would test Canelo pretty good. If not him then Kirkland or perhaps as a wild card Carlos Quintana? Angulo would have been a good choice as well.