I would replace the starter contacts, cost is a couple of bucks for parts available from almost any parts store. The hardest part is pulling the starter, but do-able at home. You might want to replace the fuel filter (not related) but easier to do with the starter already removed. The contacts are small L shaped copper parts.
