Sounds like you want a fast, simple, and easy fix for an over-sight in design...
Socks and Baffles are put in the system to prevent bubbles... and you don't have these things, and seem to be reluctant to put them in...
I think if you don't do the norm... then your only solution is to stunt the flowrate, cripple the system for a quick fix...