I used that petcock conversion kit on my CA95, worked well. In case the original 5mm JIS petcock screws are in rough shape, the kit contains instructions to drill out the 5mm threads and re-tap the hole with standard ISO 6mm threads, which is what I did.
The kit worked well, and while I try to stick with original-type parts, the modern petcock doesn't look out of place. (I still have to swap out that hideous yellow fuel line, though)