IMO. The switch is just as at fault as the tender wheel. I don't see how the pickup roller even touches the center rail at that point where the tender is shorting out.
Put a straight edge from center rail to center rail.
It looks like 1/2" or more could be cut back on that rail. ( at least to that first tie) In the short term maybe a piece of electrical tape as an experiment to see if it helps.