For anyone that should find this post and needs further help, the secret to removing the main connector is to use the headlamp beam leveling knobs to push the lense housing as far forward as possible to be able to freely remove connector inwards. This way you gain just enough space to be able to wig...