does it intermittently turn off? or has it just stopped working? (jammed solenoid)
The solinoid on the side of the pump use to control dynamic pump timimg.Does the shuttoff solinold have battery voltage with the key off ? If so then there is no need to remove the shuttoff solinoid.
The ign switch and terminals had melted on my dads 95 passat due to loose conections so you could have a similar issue.The clicking behind the console is probably the relay used to crontrol the egr and wastegate as my dads car makes the same clicking noise until we got rid of that stuff.