58 I would think ,should have the Hella lamp.
This is a very nice item with "HELLA" in the lens at the top.
Adjuster positions vary.
you might have adjustment points at the "20 past 4" position,like on my 57 or "10 past 4" is another,I think.
Best bet here is take a good look at "Original VW Beetle" by Lawrence Merideth.
It will be found for sale on this site.
Very good if you intend on restoring to stock condition.
Can,t comment on the other lamp without seeing it but I,m pretty sure you should have the Hella lamps.
If you are looking for a set,place an ad here or take a look on samba.com
RALPH.