I'm not completely ruling out a fuel problem lol. To me it just seems more on the electrical side. I'm going to clean out the fuel filter and probably the pump itself. I like you said though, those electrical parts are cheap and my local parts store has them.
