My thoughts would be to have it looked at by BMW before you try any DIY solutions ....... or at least give them the chance of looking ..... a pain for you as the dealership is so far away ...... I'll PM you a contact as your man is off at the moment
MS