Mike,

The next time your unit goes clickety click, immediately take the side cover off to gain access to the solenoid and short the two solenoid leads with a heavy jumper wire. This will bypass the solenoid and the relay that powers the solenoid (I'm assuming your relay is good though). This will bypass the solenoid contacts ensuring the starter gets full battery voltage. If the unit starts, you have a bad solenoid.

Make sure the bike is in neutral!!!

Oh yes, one more thing, have you checked to see if your starter bolts are tight? A loose starter will give you the same condition.

12 Rocket Roadster
03 Bonneville America
69 BSA Firebird Scrambler
73 Yamaha TX 750