Well, I would say wait it out and see if Wano is really over or not because based on where we left off and all the unfinished plot lines, I would say it is far from over. Final Saga can start without Wano being finished, I explained it several times already.
If Oda flops and ends Wano here, your concerns are completely valid and spot on and dropping the whole thing might really be a wise decision. However, he can still handle Zoro stuff well because he didnt write himself into a corner yet but he definitely handled Luffy poorly. Nami got some crumbs but she definitely needs a lot more to be what she once was.