Starter Click, Rocking to move the crank works.

Here is how you would do it on a touring. You need a 5 pin 12vdc 30/40 amp relay. By them on Amazon or at any auto parts store.
Yes that's going to work on both bikes.
I suggest a test be done before doing that and the way I done was just ran a fused wire from battery to number 30 and removed the old wire and taped it up
 
I second Fred's solution.
My Roadster gave me grief for months with low voltage starting problems that can be identified by the clicking start solenoid.
I fitted the additional relay to connect the starter 2 years ago as described by Fred and the bike has started easily ever since.
 
I had same thing a couple of yrs ago and this was my remedy . Checked all connection to battery , ( did not work ). Got serious and jacked up the bike removed exhaust and proceeded to remove starter . Cleaned all surfaces where starter bolts to engine and cleaned all connections to starter . Reinstalled and that was that for the starter problem. Have not had problems since . Hope this helps, good luck mate !
 
So it appears my issue may have localized to the starter relay. I removed it, cleaned all the contacts and tightened the spade terminals in the socket and so far it's been about 15 starts for 15 tries. I am letting the battery get down to about a 12v float level and will try again tomorrow. Prior to cleaning the relay, it would have failed three out of five times.

Time will tell.
 
I did that too. It worked for awhile. The bypass relay I believe is the permanent fix. Mine hasn't clicked once since I did that, and that was all I did.
Prior to that (going back a couple of years) I put on the big battery cables, put a rebuild kit in the solenoid, put star washers on all the connections. Everything helped to a point. The fellow who wrote the procedure for the bypass, says that the bypass is all you need.