Last weekend, I half-jokingly mentioned that they'd fight some "Super Satan Moria" before everything was finished...
I didn't actually want it to happen.
The ass-kicker is that we won't see the conclusion to Thriller Bark until January. Maybe not even then, since Kuma is still lurking around the island.