Plug and play - Headlight Relay Kits
I would prefer this thread not go off track.
Yes, the second schematic should work if you don't mind cutting up your under dash harness.
You needn't drill any extra holes in your firewall, there are unused holes you could likely feed the wire through.
Let me know if you'd like a harness.