2006 BMW X5 3.0d

Mrs noticed a warning in the dash cluster
When the "Day Running" lights are on, the Halo on the drivers side works 100%
The Halo on the Passenger side, does not work at all and the passenger indicator is on permanently.

As shown below:
Passenger Side


Drivers Side


One morning, i popped open the plastic hatch cover, fiddled, popped the cover back on, and as i pressed the cover on, the Halo come on and Indicator went off.
Great.... but i knew the fault would return
The next day, sure enough, the situation was back.

When the Lights are switched to Low Beam, the "always on" indicator on the passenger side goes off.

High Beam would work on both side also (until i played again).

This morning, i had a further look, i unplugged the top lamp inside the inspection port (i'm not sure which lamp does what job).
Tested lamp for continuity, nothing, was open circuit
Replaced that plug socket to lamp terminal.

Now, the High Beam doesn't work on the Passenger side too

Below is the passenger side with High Beam switched on:



Can anyone please help me in this area?
I have done a lot of reading, seems the Passenger side Halo goes out often and people just replace the bulb or buy some aftermarket LED kit for both sides.

Thank you for any help or suggestions

EDIT: I poached a photo from another post for illustration purposes



Is the connection at the top, the High Beam?
And the Connection he is holding the Halo?
Our '06 X5 also has another bunch of wires in the port too.