I've got a feeling he will fight Castillo twice as there will be nobody else out there for him not all his rivals fight in the man's division. He will probably face Castillo, then go after a paper cup title to get his confidence back and then have the rematch with Castillo.
Bookmarks