I'd probably give the edge to Leonard for both. I think he had more all-around talent than Pep (namely, more firepower) and his big wins outside of his prime weight potentially outweigh Pep's greater dominance and volume of wins at a single weight.