The replacement for my S1 Baton was an S1R II Winter edition.
Waterproof magnetic charging
3000K (I know it’s not what you listed, but it’s actually nice)
80 cri
Titanium
Also the beam is a little throwier with a smaller hotspot than the original baton.