I do something very similar.
I keep all my plant details in an Excel file which records:
Accession No: a sequential number denoting simply this plant has this number.
Genus, species, subspecies, field number: I try to keep these in line with the Hunt Classification.
Original species, subspecies: Often these names are used in other classifications, such as Reppenhagen's, so whereas I would have (say) magnimamma as the species in my plant record, I might have bought the plant as M. zuccariniana.
Date acquired, source, habitat detail sif known (from field number references or other).
Hyperlink to my Photo file, so I can bring up a picture of the plant.
I also print my labels using a P-Touch label printer. I do this directly from the Excel file, so I have the accession number across the end of the label, and then the name on two lines usually.
To expand a little on the issue of prior names, in the example I used of M. magnimamma and M. zuccariniana, what I actually do when printing my labels is to use both names, so the label would read: Mammillaria magnimamma 'zuccariniana' Repp.1240
The use of additional names in quotations is my personal modification of a recommendation by Gordon Rowley to use such prior names as Cultivar names. I don't like this with an initial capital letter, as I want to differentiate between prior use names and true cultivars - i.e. commercial named and produced plants by selection etc.