Perfect. Just about finished.

That just leaves me with the connection from the ignition switch to the ammeter to the headlight switch (according to the wiring diagram). But the harness skips the ammeter. Not sure if This will be ok or not. Anyone know offhand?

Time to get back to work.