mate im going through the same sort of thing ..i would try and put the filler from the standed tank to the bottom of the surge tank ,then have the return form engine above that ,and then have the return to standed tank out ofthe top if that make sense....are you using speedflow fittings ?
i have gone right through my car and put sealent stuff on all fitting ,it has made it better .
just my thoughts cheers