Thanks very much for the confirmation on those voltage regulators.
For the caps, yes I have read good things about the Nichicon PW series
so will replace with the following
6800uF 16v 18x35.5mm
4700uF
25v 18x35.5mm
2200uF 25v 16x25mm
2200uF 16v 12.5x25mm
10uF 16v 5x11mm
Thanks again and I will report back when finished.