I believe people have used heads from the TDI pumps, your other alternative is send it to Giles at Superior fuel injection. I hear he works miracles with pumps. He'll tune them to your specification, and you can easily increase your horsepower by letting him mod your pump.