Here's a picture I made after I upgraded to relays. You definately need a 5 prong relay for the headlight motor as the old one grounds through the headlights (light green wire) - doesn't work when you use relays.
The diagram includes parallel wiring from the alternator (Lima) to the ammeter and from there to the battery.

If you need further translation from German to English let me know but it should be self-explanatory.

Zündschloss = ignition switch
Lichtschalter = light switch