When overhauling the brake calliper assembly, replacing as many of the wear items and even the none wear items that may be a little jaded over years of use as possible will simplify the reassembly and subsequent adjustments required to set up the brakes correctly.
Using the correct specification parts is the safer more reliable way to go as well as maintaining a good original appearance.
Other related components and fixings you may wish to consider:
3RG2581T00
MSW221
MSW221RAC
SD601
3XW2580T00
3XW2580T01
1NLW005700
1NLW004700
4KGW004500
2GHW004501
3HE2592400
2GH2591900
1KT2583600
3XW2580U00
Add as many items as you wish to the same shopping cart new disc bolts 9010908718, clips 3GM2592500 and bleed screw kit 1J3W004800 for example, and still only pay the same single fixed price shipping cost. This component may have other applications in the Yamaha model range.