It is good to hear that you have found a replacement source.
Out of interest, do you perhaps know where all is the 4.7mm rivet used? I find it that Suzuki end up with two rivet sizes, instead of remaining with one size fits all of the 6mm.
A quick look at the parts list, shows part number 09409-06314-5PK, but the size is not listed.