I would lean toward the Buttery one, although I do so hesitantly as I don't think he ever had to demonstrate his prowess against a WW as great as Basilio (and that includes Cokes and the faded version of Griffith that he fought).