I've done the same kinda thing with a Cakebread getting a reserve mixed up with the reg. I now have tags on all the ones to age onto and expensive ones. I even have comments to remind me why I got them. If multiple bottles (like a case or half case) I just have one tag I keep moving.
I've had friends come over and open bottles that where meant to be saved. That is now a thing of the past after I made one of them replace it.