Hi,
I have exactly the same problem with the passengers side headlight. Sometimes it lights, sometimes not. I've swapped the parts from the other side as you did and no change.
I've had the problem for 18 months and luckily it just happened to work during the last MOT...
Personally I would...