The Elroq would tick all your boxes – unfortunately does not appear to be back on the scheme yet – but a word of caution – I have the 85 sportline with the maxx – ordered second quarter – got it end of July – lovely car, but the sportline suspension would be no good for you – holds the road brilliantly for it’s weight, but you will feel the bumps – so edition or the added suspension pack.
The only extras I have ever bought are carpets and that was at least 4 cars back.
My understanding is the Enyaq and Elroq are very similar ie share the same wheel base – the Elroq just more chopped off at boot – but if you go sportline do make sure you test that model – when I test drove it was the edition – so the harshness of the sportline suspension was a surprise – for most roads it is fine, but local potholes and low drain covers where roads have been retarmaced you will definitely feel – good luck with your search – is it this quarter you swop?