If you're intent on tuning the 1600 then it all depends on budget, intended use and power expectation (if any).
You already have the exhaust manifold so that's a reasonable start. Carb-wise you have a choice....keep the existing manifold and throw in a 38 DGAS which, when set up properly yields...