I use 2wd discs and S2 calipers in mine thrush, and never had any problems with them.

Did you replace all the brake fluid in the system when you had them on the XR, as this would reduce the braking performance, as would leaky servo, old master cylinder, rubber hoses.