FZ6 S2 correct chain/sprocket teeth pitch?

[Arfa]

I'm pretty convinced my chain needs replacing, bit clattery when labouring (after adjusted to correct slack), got a couple of tight links that don't lay flat (even after plenty of cleaning and fresh lube) and I can feel a slight judder in time to chain rotation. It's done 22k and believe its the original.
Anyway looking a standard DID chain/sprocket kits I seem to see a mix of kits:
16/46 teeth, 530 chain (e.g. https://www.mandp.co.uk/products/yamaha-fz6-fazer-04-09-oe-did-chain-and-sprocket-kit-594874)
or
16/47 teeth, 520 chain (e.g.https://www.ebay.co.uk/itm/YAMAHA-FZ-6-S2-Fazer-ABS-2009-09-DID-VX2-Gold-X-Ring-Chain-JT-Sprockets-16-47T)
Current chain just says "DID" "50V4" on the links.
What's the OEM spec? What spec should I replace with if I just want to keep it standard? I'm not after any increase in torque / economy or such like.

Thanks!

[agricola]

Standard set up is 16 on the front and 46 on the rear, chain 50V4 118 links