[zhasan]

I'm also thinking about increasing the gap b/w the baffles for the bubble breaker. The water seems to go over top it if I open the drain valve more than 1/2 turn

I left about 1/4 to 1/3 of an inch gap b/w them. Is that less than the optimum gap?