Yes those are the ones Paul, I thought they should be available in the States.
If there is anything you can't source over there Corky you can always shout up and one of us will buy it here and ship it for you.
Was probably a good move buying the LB mechanism for the headlamps.
Just make sure that when the lamp assembly travels up and down it clears the back of the indicator unit and its wiring.
Guys method of getting the alignment works a treat on the Mazda/Ford motors as it does with the FIAT motors.