I also encountered the "diagnostic fee" when inquiring about the issue, despite informing them of the TSB. But my car is well out of warranty so it was a moot point anyway.
Then I checked the software version. It's 7.0. My conundrum, however, is that it doesn't want to play nice with my iPhone...