Tom,
This is probably not quite the answer you are looking for, but about two months after Lionel delivers the Legacy AF Pacifics, the headlight part should become available. A long wait, I know, but a temporary repair could tide you over until the late fall.
A friendly thought.
Bob