Without criteria it’s hard to say. Angle was as close to the total package as anyone. Ever. Rock, was still great at everything that makes an iconic wrestler, but the mainstream appeal and the reach beyond wrestling (even pre Hollywood) is just too hard to ignore. By my own criteria, which lends a bit more weight to in ring work, it’s Angle, but by the criteria that I think the average fan would go by, Rock is pushing Mt Rushmore status.