2007 3500 5.9 Dodge, completely stock. Would not run past 3/8 tank, removed the tank and pump, found a couple of things. The filter basket on the pump side is full of junk, and after running the pump on the bench could not tell if anything is coming out of it, air, fuel, or anything. So I am guessing the pump is at fault, no visible splits in the hoses. Going to replace it anyway, my question, since I can get at everything should I go with a external aftermarket pump and filter system or replace the internal pump with something aftermarket? Either direction who makes a good pumping system?