I understand this is an issue... i have it and its annoying... granted no idea if you're issue is worse than mine or we all have it the same.
My general consensus at this point on service department touching my car after 10 cars is - only take the car in if you ABSOLUTELY need this fixed.
Otherwise, this will equate to something else broken, another hassle or the problem made worse than before... granted they may fix it perfect but unless its something I NEED to fix, I am not taking that risk. One may argue, its a $70k car etc... sure I agree there but read my comment above - you will be faced with a hassle sooner or later, it is up to you how you manage it from there.
__________________
2 x N54 -> 1 x N55 -> 1 x S55-> 1 x B58
|