Maybe consider a terraced/cascade system, I have been thinking the two ideas could also be hybridized, with tapered baffles that do both re-direct, and cascade from side to side, this would also keep the highest flow areas directed into the deepest sections, lessening the dead areas.
Also, 45 degree braces, or even better, cove trim in acrylic in all the corners would decrease the friction/flow loss, give better hydro dynamics, and stabilize the baffles.