My vote is the latter. I would highly suspect a weak fuel shutoff solenoid. I had the same symptoms last year and found real fine “grit” down around the spring of the plunger. I cleaned it up and it worked for a year. However this year same symptoms and found the body of solenoid getting hot...
At first I tried to disable the solenoid by removing the rubber tip from the plunger and unplugging the electrical connector to the solenoid but even the metal tip of the plunger was enough to keep fuel from flowing and engine would not start. I ended up by depressing the plunger and using a...