Benoit. Not even a question. Angle had all of 2 years of genuine good wrestling, then settled into his formula match of finisher/kick out spam that he'd have with anyone. Benoit was a far more rounded performer in the ring who could adapt to other wrestlers and styles instead of the other way around.
Also, Arn Anderson was ABSOLUTELY a better wrestler than Flair was. A better promo more often than not, just a different promo style that wasn't as bombastic and over the top. There was never a point in the Four Horsemen where Ric Flair was actually the best wrestler.