It was always supposed to be this way.
Lucci, Crocodile, Enel, Doffy, BM, Kaidou all were multiple levels above their underlings.
But the issue is Oda general writing style is making Luffy struggle, lose multiple times, finally beat Antagonist and go back to being same weak again. Oda can't write the story any other manner.