Starter solenoid clicks and the gear goes up but doesn't spin. Doesn't always happen but it started back doing it Sat. I can tap it with something and it'll work. Is this a sign it's needing to be replaced? Anything I can do maintenance wise?

I had something similar happen to mine last year ,( not the same motor) took the starter off.. and took it to a local starter shop...they tested it and said it was the solenoid sticking...had them rebuild it with new brushes , and clean it...$30 later it was good as new...On my motor the starter was very easy to remove...I would suggest taking it to a starter shop and have it checked. NOthing you can really do unless you know how to rebuild a starter.

might take it to a start/alt shop.. could just need a good cleanin'.. possible "tapping" on it can loosen case magnets.. don't do that.

Save yourself $$$. As mentioned above. Starter/Alternator rebuild shop & back on the water. Learned this one years ago.