Anyone have any basic advice on re-marking the tiny diodes, because the cathode/ anode indicator keeps rubbing off easily?

Yes, that is what I went with. Good call! As long as you keep any container marked with the diode type (i.e. 1n4007), all that is needed is the marker for the cathode/ anode.