Still working on spatial filtering. This is probably going to work pretty well.
However, in the mean time I have uncovered another wrinkle, maybe a good one. Aligning the diode axis well with the cylinder optics is very difficult. The diode mount I am using from LSP allows the diode to be positioned so that it is centered on the collimator. This works well and produces a more symmetrical central far field spot, but the rotation of the diode in its countersink is pretty much hit or miss (mostly miss). With the rectangular correction optics it is easiest to mount them with the expansion axis strictly parallel with the floor. If the diode is rotated even a few degrees from level the effect on the far field spot is to noticeably increase the vertical dimension of the spot. To visualize what I mean imagine if you compressed \ horizontally vs _ The problem can't be corrected by adjusting the lenses in rotation unless all the diodes were "off" by exactly the same amount and in the same direction.
The best solution is to set the diodes as perfectly parallel as possible. I am considering using a VERY small set screw in the side of the back retention plate, so that once the diode has been installed as close to good as possible then the set screw is tightened and the final tweak is performed along with the X/Y shifting operation.
The reason I think this might be good is that when the lenses are optimized for the rotation of a single diode and the near field spot is 2mm x 4mm the spot I get at 13M is 12mm x 25 mm. This is 1/2 as high as I was expecting.