24INCH LED LIGHTBARS

could you please give me advice as i want some changes on my current setup which is below:

Car uses negative polarity on Headlights

so i have installed 24inch led light bar comes on when you cycle the high beams on and cuts off when you cycle them off my current wiring is below,

Using a standard 30 amp 4 pin relay, the wiring is as follows:

*Pin 30 goes right to the battery with a 15 amp fuse in-line
*Pin 87 goes to the 12+ input of the LED light bar
*Pins 85 and 86 go directly to the wires in the plug for the high beam light bulb. Polarization doesn't matter with these wires (doesn't matter which is + and which is - either way they're just completing the circuit and tripping the relay)

Then i have ground the - wire on the LED light bar and that is it, they kick on with the high beams.

that is what i am trying to achieve now

I want to be able to have the bar;
- Come on automatically when the high beams are flicked on (this option i have it and dont wanna loose)
- Be able to turn the bar on and off while high beams are engaged for in town driving
- On a switch so that it can come on independently when the high beams are off

can you please advice me how to make this happen?

thank you