You did an excellent job of describing your symptoms.
It’s gotta be either the pump, the pickup or the lines between them.
Make sure no lines are sucking air anywhere, look for wet spots on the rubber ones, and replace any rubber that has hardened up.
Actually if you don’t have it already, use...