The second checklist is correct. I would say that the first one should be deleted with collections and images moved to the second one.
For anyone who may wonder: I have asked Admin about these before, and he said that in years like this (2014), where there is no stamp difference, they should be listed year-by-year. However, in 2017, when different colored stamps were used to indicate rarity and different sets, they should be grouped by the stamp color.
I'll never quit collecting entirely, but I am downsizing. Check out my COMC store and help me thin out what I don't want so I can buy cards that I do want. See something you like? Send me a message on here, and we can knock the price down quite a bit. I'll even take a bit of a loss if it means getting you a card you really want.