CB_
Sound like your shut down solenoid has either gone bad or is getting stuck, Pull it out and check closely for metal shavings around the stem and down in the pump, if there's metal in there your pump is probably going bad.
If you remove the rear pump mounting bracket getting the solenoid out is much easier, then before reinstalling the bracket cut the top of it off where it rides higher than the pump makes it easier next time ... ... ... .....
Rick