I found a great tip from Lin on an old thread of his which is to get yourself a Pentel White 100WM marker pen. About £4 inc p&p from eBay. An example here.
Marking some parts before disassembly can be very helpful come the rebuild.
The ink will survive extremely well and is resistant to oil and grease.
I have used these pens with good effect for many years