We had a similar situation and decided to renumber everything with the YYYY.GGGG.IIII (year, gift item) system. We have noted any old numbers in our computer entry of the item. Trying to understand and maintain the old systems was just too confusing.
