Ed, look at the locomotive from the direct side before you move the headlight. Since it has an extended smokebox, the headlight might extend out over the plane of the coupler knuckle, which is a no-no, as the headlight would strike a passenger car diaphragm when switching.
Of course, you could always shorten the smokebox...