What lights to buy to upgrade older S21A and M21B?

There is a nice easy formula to estimate achievable throw for a smooth reflector, see item (3) this post:

Unfortunately OP is very difficult because (1) different OP reflectors have different levels of OP, and (2) the same OP reflector diffuses different LEDs by different amounts.

3 Thanks