Ok, got it, 1156 bulb single filament, only one 1156 bulb in each headlight assembly. Two wires power and ground.
Regarding a dynamo or alternator swap, of course, each might present their own mounting challenges. I'd only consider an alternator swap if it was feasible for mounting, the dynamo...