I have not offered much help here, but I agree that the best thing to do would be to inspect all the parts for wear and partially re-assemble to see if the shift linkage and lever are working properly.
If you want, you could *slightly* rough up the clutch surfaces, which can help the clutch...