DTR,
How does the near field beam size look? Is this a lot smaller than the M-140? Once you have them nearly perfect at 30 feet then take a mirror (even a second surface wall mirror works for this because the spots are so small that the mirror is pretty high quality over small scales) and send the beam back to a screen near you and fine tuning of the focus is a snap.