Quick update
After much headscratching,lots of splinters,
I was in the area of despairation
I decided to clean the comutator,
It looked good, no visible wear,
Using a narrow blade screw driver I cleaned the gaps,
Bit like under your nails,
Yes debris came out, good wash with cleaner,
Reassembled,
Tried it,starter worked better, charge light went out!
Successful
But, it didn't look like it needed doing
Picture of before doing

Sent from my SM-A546E using Tapatalk