You might check the battery connections, too. I had the click-click-start thing and it turned out to be a loose connection on the negative battery terminal.

The post on the battery was too small. I tightened the connector as much as I could, but I could twist and pull it right off.