Actually since the XJ12 was considerably rarer than the XJ6, is it better to list XJ40s and X300s (and possibly Series I-III) as XJ6s by default, unless it is clear that it's an XJ12?

Anyway I've gone through all the XJ40s on the site, and listed all the pre-1993 ones as XJ6s.