Sherman,CT ehy, well your not far from me in poughkeepsie, i just converted a b3 passat wagon from 2.0 16v to 1.6td and have all the original gas engine cluster working including electric fuel pump, you should stop by and get some ideas, i have dealt with all these issues many times,