Between the 2 x XS650D and XS1100, I have 7 x calipers and have changed all of mine to stainless machine screws. I just place an old nut on the new screw, file the end to match the OE and unscrew nut to clean up the thread.
Has worked a treat every time.