Elbaf is actually great on a re-read. If you cast aside agenda, it's got everything from lore, callbacks, flashbacks, interesting characters, and crazy revelations. Imu's design reveal, Shamrock reveal, Loki and the legendary fruit, black Nika, wings getting conqueror's haki, Xebec and Roger, even Gunko and her secret eye powers
I would even argue Elbaf the best arc of post-timeskip. The pacing remains to be seen but so far so good. The only issue is weird placement of flashbacks like Shuri but even that makes sense since we need to have context for her and Brook