Nah, man, I think Oda has some crazy stuff lined up. It will be very controversial, but the end of Wano is going to turn into a giant escalating fuck-fest that's going to lead directly into the final arc and set the stakes higher than they've ever been.
Even if I'm wrong 95% of the things I think Oda is planning, if even 5% of them are coming, this will be the most explosive arc in the series, by far. Act 4 should be a hurricane of emotions.