ihab,
As I havn't gone ahead with mine as yet I'm not qualified to answer your query, but you may be right. What you need to do my friend is ask
richirich . Apparently he has a black belt

in these matters, I'm sure he will assist. Because you have 2000 model headlights they are easy to open, many guys have done this mod themselves so I'm sure you & I can do it.
Please excuse my ignorance but do you drive on the right hand side of the road as in the USA (driver seated on the left) ? If you don't, make sure your supplier is aware re correct headlight beam issue.
Let me know how you get on.
Foomph