Airation is good for the water, baffle would probly be the best bet. Does your return pump take in air from the overflow?