I think that our current numbering for adjustments works well.
As for "late submissions:" when I measure a course, late in the year, for a race that will be held in the following year, I often hold the certificate until after the first of the year. This makes the expiration ten years from the first running.