I'd start with the ecu temp sensor, its located in the flange on the front of the head. it will either be a push fit blue sensor or a screw fit white sensor. Also check out the digifant tuning guide in the MK2 maintenance + info section

Also check the filler neck for rust, if there is any replace it asap, but it sounds like the damage has already been done!
take out the rear seat and you'll see a round metal disk, under this you'll find the lift pump/fuel level sender, pull this out and check for rust and debris in the filter. if there is any, get yourself a magnet on a piece of string and swish it around the hole, shake the car as much as possible and pull the magnet out. Clean any rust off it and repeat till it comes out clean. Chuck the magnet back in and refit the pump, brim the tank and drive it for a week, recheck the magnet. Keep at it till no more rust comes out!