Went to the Edison Greenberg train show this weekend and came across a dealer who had some parts that I needed.
This dealer had a bunch of original 158 dummy headlights and not re-pros (the re-pros have a shallow draw than the original one, repro dome is not as deep as the originals).
He also carries cast metal prewar parts and one of them was the replacement filigree for the single or double goose neck lamps. There single is different from the dual type goose neck so specify when ordering.
I ended up buying 4 dummy headlights and 4 replacement filigrees.
I did not see the items on his site so I suggest in emailing him what you need and ask for the price.
His name is WM.H.BECKER Inc.
http://williamhbeckerinc.wix.com/trains