Funny you mention that particular model because I’ve seen about half a dozen of these at work and their owners don’t really seem to mind. To me, the worst thing about those is the horrendously blue emitter. But I digress; different strokes I suppose.

Maybe try one of those drop-in TIR optics for the S2 and see if it cleans up the beam.