Which pump are you using? Also, do you have any pictures of the baffled tank, you may simply need better baffling as the forces in the tank may be more violent than you think.