Just got some good news on new Golf GTI Performance Pack 5 dr DSG with metallic paint. Build week has come forward 2 months to week starting May 14th (order placed on April 12th). So, dealer now saying they are hopeful for delivery by end June, which would dovetail perfectly with my current A4 lease.
So, maybe leadtimes are not as daunting as first appeared.