Did you tell the second shop about the findings of the first? Might have biased their findings?

I ask because your leakdown test revealed leakage past the pistons/rings not the valves like it would have if I really was a vanos problem.