I'd guess that most Yamaha tool kits must be pretty generic (which is probably why the plug box spanner for the XTZ doesn't actually fit the plug!). IMHO if I was in your position I probably wouldn't bother sourcing an OE tool kit because most of the tools in it are crap quality! I'd be tempted to make a decent one up yourself to suit your personal needs (unless that is you want originality!)

__________________