This isn't a problem for me as I have no desire to use a non-standard size, but for those that have, I was wondering if you'd found a 'correct' terminal, or is some sort of 'magic' involved ?

I'm just building a fresh front harness along the lines of the Carat one, with extra wires back to the relay plate for the inner main beams and the extra horn. BTW the Carat one is only £130ish new iirc.
PS. * H4 terminals for the VW housing that is.