Jeff,

I'll go 'against the grain' here.

If it has been running fine (for about four gallons of fuel) with the existing fuel/plug/exhaust, I see no reason to start making drastic changes.

Try a new A3 plug (since you have one) and see if it cures the issue.