Why don't you want to just jumper the tach wires permanently? It's what I did when I found the connector full of water. But my EGR stuff is non-functional. Not sure how it relates if you wanted to keep it all.

-Rog