Complete fuel system

DentalDart said
The EFI tank is very tempting but probably 2x the cost

But that's a 1 time in your life expense!

DentalDart said
sometimes it fires faster when I hold the throttle down

That sounds like flooding.

Holding the throttle open is the cure for a flooded intake.

Thought ..

Next time you stop like getting gas, quickly hop out, remove the air filter and look for fuel dribbling into the intake.

It might be something as simple as a too high float?