If your vehicle needs to get an annual roadworthy check and you want to get it right, you might want to check on your States regs.
A separate switch for on/off accessory lights when high beam is activated is required d
My wiring diagram and comments conform to that regulation possibility

