Hey Guys. First of all HSS (High Speed Steel) or even better HSS w/Cobalt Taps or Dies are defintely worth the extra cost over less expensive tool steel tooling. You can find resonably priced sets online at MSC Industrial.
To prevent breaking the tap; A good Tap holder is also helpfull to prevent snapping the tap. Take your time and back off the turns on the tap to clean out the chips to prevent the tap from building up chips and it help break the chips. Always use both ends of the taps holder to drive the tap. Never a drive from one side (as in usin g a wrench!) This will snap a tap in a heartbeat.
Also, Know what thread your going to recut!
I'm not sure of the Yamahas we are riding, but some of the Japanese metric pitches (JIS) are not all the same as ISO metric (euopean) standards.
Hope this helps.