The plan is for the overflow at the left end of the tank with returns along the back of the tank every few feet with majority at the right end. So you are correct, it'll probably be very river like with most flowing right to left.
The baffles aren't a bad idea as I am going sand, though I suspect with the rays they will blow it wherever they want anyway, not sure it'll do much to slow that down.