Thanks for the advice.
Yes I am aware of problems with the brass heater pipes but luckily mine are all good with no corrosion, and the tank also appears to be in very good condition with no rust anywhere inside or out.
BTW, although there are a lot of cheap replacement pumps around, there has to be a question mark over their quality. I didn't want to take the risk so I got a genuine pump from a Toyota dealer, and although expensive I thought it was good insurance for such a vital part.
If you ask Google, there are reports of many cheap 'knock off' pumps around, with blatant markings on the item as well as the packaging that looks exactly like the 'name brand' genuine items. Of course that doesn't only apply to fuel pumps, but that's another story.
Are any of these worth bothering with?? Who knows??