I'd like to see Lava's correction set with the Thorlabs collimation lens.
I'm betting that is optimal, if you can accept the loss, but alignment will require mounting hardware made in a GOOD machine shop. The issue will be where to place the clipping mask.
It still will have a tough time fitting on standard scanner mirrors and the $$$ per mW is astronomical despite the lower laser cost.
One step forward, two steps, back.
Steve