I hate to be curt, but wouldn't it be cheaper and alot less hassle to sell the 8v as a complete car and buy a 16v.
Everything is different on the 16v. You name it VW changed it.
From what I can gather on the list, most people rip out the 8v block and replace it completely.
Regards,
Tinman