I agree, that would definitely be much better.
Though it kind of concerns me with the way the rest of this series is going to go. The kinds of things they are setting up now, such as making Mermaid Island Luffy's territory, seem like they're going to interfere with what was originally just a supposed to be a journey to the end of the Grand Line.
They already had a huge setback at Shabondy that caused us to go backwards for like 3 arcs, now it looks like the Strawhats forward progress is going to be stymied by inter-pirate fighting and politics.
Which is the kind of thing keeping any of the Four Emperors from becoming the Pirate King. I was kind of hoping the Strawhats were going to sidestep most of that and just keep adventuring forward.
Now, I wouldn't be surprised if Luffy ends up as one of the Four Emperors after kicking Big Mams ass.