Adks, have the battery load tested as well.
I had a similar problem this past weekend. We had been on the water for about 3 hours, then went to start only to hear click, click, click..........
New interior is in, now it's time to get on the water
2002 X Star
Sold - 76 S&S