One thing that is worth considering when doing all this is your solder
REcently I have given up trying to get along with lead free solder
It takes more heat to get it melted and even then it's pretty rubbish
Frank at JPF put me onto a silver content solder and I seriously haven't looked back
http://www.rapidonline.com/Tools-Equipment/Future-HF-halide-free-no-clean-cored-solder-60028Works really well and the solder melts easily and even more crucially goes hard again quickly resulting in fewer burnt fingers.
I have also resorted to two different soldering irons. one with a semi pointed tip for soldering wires to tags and one with a big chisel type tip for soldering the back of pots etc
A 25w Antex XS iron is the latter and I am so glad I started having the large tip iron available as it can melt the solder to the back of a pot quickly and easily and once again minimises heating time so better for components and fingers.
Remember molten solder flows TOWARDS heat, so knowing that will enable you to get in and apply heat and solder and get a neat job hopefully