Hi All
 
The OBD is installed and this mechanic has the reader for it.  No codes are coming up or at least he is not saying there are any.  But he did decide that with no codes showing it was the mass air flow, so we changed it, to no effect.  
 
The engine is mid 90s' but I am not certain exactly the age or engine code.  Where can I find the code and will it precisely reveal the age?  I have been told it is probably 96 and is I think it is digifant.
 
As for the water there were several rust holes on the top of the tank, the water came in through a combination of driving in a massive thunderstorm and a trip to a comercial car wash.  After driving it for 100 km on the highway, I am positive I can hear the fuel pump so may be that needs changing, not sure about the filter.

I will be going to another mechanic tomorrow and will see what he has to say before bouncing any of these suggestions off him.

Thanks Dave