Finally done. Scratched the gauge panel in my haste to get it installed. Oh well, war wound.
Now I have working dash lights and a high beam indicator that I did not have before. And the big plus is that my charge system is actually working right.
Also took the opportunity to wire up for reverse lights, a hood blackout light, and electric wipers.