Adding clearwater aux lights in addition to the aux lights already present.

Want to verify some question for the service manual re: Wiring

First, the headlight plug. I have the Daymaker headlights, the reason I need better aux lighting. Blue and White (BE/W) is High Beam.
Green and Yellow (BE/Y) is the low beam.

Correct?

next, I added to the acc switch pack switches in the 2 and 3 position next to the Aux Light switch that was already there, (#71400044). I also purchased the DUal Harness accessory (#69200722). The red and black wire would give me switched 12v from the #2 switch. Correct?

Thanks for any help.