starter issues 98 fxdl

[vharmon]

I am having some starter problems on my 1998 fxdl. I had the starter clutch replaced at the dealer a little over a month ago. When i hit the starter switch, I can see the jack shaft spin into the flywheel, but it does not stay there, it moves back and forth and then kicks out completely where it then grinds against the side of the flywheel. Sometimes when I hit the starter switch, it does not even go in, it just spins. I have taken the starter out and bench tested it according to the repair manual and all seems to be fine. I thought it might be the switch or the wiring to the switch or even the relay that was not allowing enough current to flow to the starter to keep the solenoid fully engaged. i bi-passed the switch by running a wire directly from the battery to the switch connection on the starter, but it still does the same thing. i am concerned that i am going to be stranded or ruin the flywheel if this continues. do you think the problem is the solenoid. Is it still working but getting weak. Is there any cleaning or adjustment that can be done to correct this or should i go buy a new solenoid.