I do have an ATO and plan to switch it over to the new tank and put it in the return section. So what I'm getting is there's not really a consensus on whether the 3rd baffle is absolutely necessary and everyone does this differently.
But if I do use only two baffles it would have been better to go over-under than under-over.
Maybe I'll just get the third piece replaced today.
Man, so tired of errands!