HO source for twin beam headlight on Baldwin S-12

I am working on an HO PRR Baldwin S-12. The model is by Stewart Hobbies.

The single large headlight housing contains two smaller lights.

CalScale makes a dual pyle headlight (190-395) that fits the housing as a conversion that sits proud of the bezel. The PRR units retain the outer glass cover from the large headlight. The twin lights are recessed into the bezel.

http://www.rr-fallenflags.org/prr/prr8752s.jpg

Is there a better part to use?

Thanks in advance,

DAS