The update I came to post was regarding the nissin brake calipers. They arrived, with banjo bolts included, and I've had time today to fit them and bleed them, and they seem to pair with the OEM master cylinder and lever (nissin branded, I noticed). It all looks good, and was a simple swap over...