Just a thought, but what about an old school solution to your problem? Use some tape (say electrical) and start shaping your beam by covering the outside of the lens.