I’m in the middle of this same task, illustrated by this picture of the passenger side of my RHD.
I have a question about replacing the relays. I ordered Hella replacements which turn out to be branded Mahle made in India. Is this to be expected these days?