I thought I had it fixed by removing all wiring to an added ford type solenoid and reverting to just the stock wiring, however, today it's back to taking several clicks before it finally cranks. I will try adding an extra ground from the engine to the frame to see if that helps.