If you're replacing the entire driver system with the GTi system a pipe from a GTi would be a good idea
check head for pitting where water flanges mount to head if pitted get some wet and dry and a flat block and rub it down until pitting has gone