You can easily replace the clutch side from an FZR600, YZF R6 or SV650 (plus many more) and the front master cylinder with an FZ1, 650R (plus many more) and have bolt on adjustable levers.
You can always modify the clutch lever to fit the clutch perch, but the XJ600 has a unique brake lever and only stock replacement available.
Men do not quit playing because they grow old; they grow old because they quit playing.