Hey Scott -
My rule of thumb is to replace like with like in any project I'm working on. So, any orange (ie low leakage) caps are replaced with new low leakage Nichicon KL parts.
For bi-polar caps I replace with Nichicon ES. For signal path caps that are not low leakage or bi-polar, I replace with Nichicon FG. For everything else (bypass caps, power supply, etc) I replace with Nichicon PW.
Exceptions are made in certain situations if there are size constraints or if there are Wima style film caps that will fit.
Take your time and go slow. I always take a picture of the board before I start just in case I forget which way a cap was oriented. I also only do one or two caps at a time and double check everything. Once a board is complete I stop and test before moving on.
Last piece of advice - if you're going to be doing more of this type of work, get a Hakko 808 or something similar. It is amazing and well worth the cost.
Good luck!
-Matt