I've exactly the same problem (with the difference I've 1.9 Z3 jets). Does the 4x4 pickup pipe fit into pinto/T25 pump? And does that combination fit to standard 4x4 sump? And is that pinto/T25 pump as reliable as cossie 4x4 pump?