Hunt for the NOS "right ones". Yup XT M730 blocks were good BITD, but finding NOS ones now, they tend to be a bit hard and not so grippy, but a small price for correct.
Cables etc, again, go for proper type NOS, like these:
https://bicyclist.cc/?s=m730&post_type=product
(see page 2 for the cables).