I read somewhere about the ryco filters and efi set ups and they said have in going into the filter with the in arrow, and use the other in arrow as the exit line. Its stopped my issues. Maybe worth a try. Youll just have to swap the outlet line off the filter to the other 'in' port. So not a big job or option to try
just re read that , The fuel goes oposite direction too arrows , water only gets as far as the bowl and doesnt come down through the paper
Some nitwits drill all the holes in their tank after it is all welded up which makes it hard to get all the filings out.