When I heard that my favorite Trinidad was gonna return,I thought that he needed a solid but not dangerous opponent.Here I will throw some names and see what you think.I actually thought Holmes was the right one.

Mayorga is the perfect comback bout. He leaves himself open all day long and his power is very exageratted

I think I just answered this on another thread.