I'd put my money on the problem being with that change-over valve. You could almost eliminate the filter because the test pump uses it as well.

__________________
1988 325is (purchased new) sold
2004 X5 3.0 2005 X3 2.5
2008 X5 3.0 (new to me)