Wow, blast from the past. It's been a while for me with an 8v, but I think swapping to 8v N/A should be as easy changing exhaust and the intake bellows between fuel dist. and throttle body. 16v conversion will require much more. At least dash and full harness. I swapped out fuel tank and lines last time I did this swap. Thinking about it now, seems like you could throw a couple of barbs in the feed and return lines in the engine compartment and splice in 16v lines up to the motor. Double check this, but I think the 8v and 16v pumps put out similar pressures. Years ago I saw one with a 16v running on CIS, they just fudged the CIS injectors into the 16v intake. It was pretty hack, but ran surprisingly well.