Jim,
Have you actually taken your heater to bits yet ? Worth doing, all you need is a spanner to remove the box, and a drill to remove all the pop rivets.
Have a look at your heater when undone this all, check to see if there are any signs of leaks, leaf debris, and see how perished the...