Wear Ring
The first problem sounds like the wear ring. Remove the steering nozzle, check the wear ring look for any missing pieces, and check the clearance between the impeller and the wear ring, it should be no more than .040". While you are there check the impeller for dents, dings.
Do you still have the grey tempo fuel lines?
Lou