Two minor questions.

If you are upgrading headlights, I would highly suggest switching to a relay type system.

Member crackedback (Rob), sells a pre-made kit that you can just install and run upgraded lights.

The factory wiring isn't quite up to the task.