Excellent Pete, nothing like a new toy to keep the interest levels up
You'd need to add all the glass to that 16mm. I normally add up the thickness of all the glass including the glass over the sensor, and divide it by 3 and then add that to the light path. I doubt it would total 6mm though.