x2 starter making noise is an indication it's probably worn out and needs replacing. finding a place to rebuild it is usually difficult because most everyone replaces them which is easiest and cheapest. go with a new, mini starter that comes with a good warranty.