Although I have older S1 & S2 hubs in amongst my stuff, I'm certain that I have no lock rings.
However, @ some stage my three hole hub puller was modified with an additional hole (giving two holes @ 180 degree) so presumably the holes, whether M6 or M7 are on the same PCD. Therefore, the later three hole lock ring will fit, though the clearance holes will be oversize for the hub M6 holes. Better than nothing & @ least good grade M6 (8.8 & higher) high tensile fixings are readily available, rather than the M7 screws supplied made of Play-Doh.
I'd be inclined to use the later hub ring if you cannot source an earlier one. Perhaps fit an M6 socket set screw ('grub' screw) along with an M6 'K' nut which will not shake loose yet are removable.
(If you do go that route & supply of one offs is difficult, I can spare them FOC

)