With cable disc brakes the easy answer is to swap them with hydraulic brakes, you can get a pre bled set of NEW Shimano m365 brakes for about £70. About 30 - 45 mins to swap both front and rear over and job done. No need for wire stretch or kinks & no snagging of the wire.
For < £40 one can get...