You and I have talked about that Wayne Shorter passage in a different thread. (I'll have to find it.)
I use lots of passing chords in my arrangement, so I can't write in much detail here, but this is what I play, more or less, in the last 8 bars:
dm7, cm7 / bm7, E7 alt / am7 / D7 / ebm7 Ab7 / G7 / C etc.
I think it is much more effective to delay the tonic chord until bar 31, but that's just me.
However, in my arrangement, I don't hit the tonic chord at all in the first chorus at all. Where I would in theory hit the C on bar 31, I hit a Bbm with a major 7, so the last note (on the word "dream") becames the first note of a new chorus in Db. I then finally hit the tonic chord in bar 31 of the second chorus.