Don't have a good answer for you, just a point-
If you are going to swap a different head onto it, you would also have to replace the pistons, as the stock B8 pistons are only notched for 8 valves. You might be better off just picking up a D15B7 or D16Z6 and swapping the whole thing.