Ahh, the typical saga of the VW mechanic. You think it will be an easy fix, and days later, you are still wondering how much more can be wrong here. I don't like that feeling. You seem to have an extensive hoard.
I thought I was bad, but you must have me beat five times over. Keep it running, that's the goal.
Enjoy.