Mine was doing the occasional single click trick. I was afraid it was the starter contacts, too. Even had a Toyota mechanic diagnose that in a parking lot where I was getting jumped (the only way it would start when it acted up). [Oddly, it happened more often when it was damp.]Went by a auto parts place to have the battery and charging system tested and they couldn't get a good connection - even though my battery terminals/clamps looked clean as a whistle, we cleaned them and the problem cleared right up. No problems since, of the single click variety, that is. And that was a year ago...