This is exactly what happened. First diagnosis was that cleaning would fix it as they see it quite a bit on the Gen 1. They did not charge me for the second diagnosis. However, they were going to charge me labor to install the new part.
Have not heard back if they received the part in yet to schedule the install.