Just got the X5 back. Completely fixed as far as I can tell.

According to the dealer, mine is the second such factory initiated repair to address the same symptoms.

Happy ending for now.