Just to add on to the story, I also had a weird issue with the oil level indicator in the iDrive. It would show 1 mark less than 'max' and after a few minutes it would show this:
This happened a day or two before my water pump failed. Could be somehow related?