You can use the S2 reflector in the S2+. The S2 reflector is deeper so it cuts off more of the spill and collimates it into the beam. I characterized the S2 optic in this thread. Maybe you’ll find that interesting.
Edit: S2 reflector does not work in S2+.