In JamMt, I took the current AOM solution and added a thick lens (index of refraction = 2) to act like a concave mirror to redirect the beam into the same spot in the AOM. Because the beam is so small at the mirror, the curved mirror does not change the wavefront much at all. A 1 m focal length lens could be added to help the mode matching into the fiber. See attached photos.