Dont change the headlights, as then RTA passing will be a nightmare. Aftermarket xenon HID/ LED is not at all appreciated by RTA even the most expensive ones. My friend Porsche had a Xenon and on one side it failed, so he got it replaced with aftermarket hi quality xenon as original was too expensive and it took him 4 hours to explain, request and literally beg to RTA testing guys at tasjeel. When senior officer came, he understood his cost concern and got it tested properly to see if it's blinding the other side traffic or not and then he passed it.
If your car doesnt come originally with xenon, then better stick to regular yellow light or it will never pass.