You may want to get a pair of the rubber sealing rings that go around the H4 lenses ... #15 in the diagram below ... sometimes they stick and tear apart when disassembled.
All 911 headlamp assemblies with glass lenses use the 356 part 644.631.114.00 shown below, but a VW part for '49 thru '66 Beetles is the identical part by Hella!