Wow, right after i posted in the other thread about Waldig being the only one to encounter that issue. Looks like your #2.

Long story short, and read between the lines. I think your most effective remedy is exactly what you said about taking it yourself to the machine shop.