Rounding off the baffle edge like Richard suggests will help; the easiest way to do it would be with a quarter round bit on a router. In terms of helping with the bubble issue, slowing the flow will really help (may not be possible in your case) and keeping the post baffles water level high will also help.