I would just set it at the best divergence over the longest distance you have available and put a dot of white paint on both sides of the expander to mark the best setting... so that when the dots are matched up, you know you have the minimum divergence.
It's easier to set divergence with someone at the other end of the beam to tell you when to stop.
Also, when adjusting, it isn't necessarily the best to set it at the smallest spot size at 'X' meters away, but at the point where the beam spot is the same size as the beam diameter at aperture 'X' meters away. This way, you don't get negative divergence (a converging focal point somewhere in the beam).
For example, with 1cm initial beam diameter from your expander, you want the beam to be close to 1cm at 1 meter away, 10 meters away, 50 meters away, etc.