That would be the very first thing to do.
Take as much freeplay out of the linkage as you can, while trying to have 1/2 inch or so of pedal movement before it contacts anything in the clutch assembly.
It just may solve the entire problem if you can get it adjusted like this.