Hi Richard,
Sorry to hear of your trials and tribulations. Sometimes these toys are just too far gone to restore, at least within our own capabilities. I try to buy models which look like they have not been "tampered" with too much, and have been taken care of. I'll take my challenges in manageable doses, thank you. It's less easy on the pocketbook, of course. I think I bought my B31 mainly because it had an intact whistle, and looked pretty good, overall. (I didn't even think that it might not have a heater!) These are the challenges we give ourselves...
Best of luck,
Paula