If you are after extra power why not tune the 1.6 first before it goes in ?
I would in any event fit it(1.6) as extra torque will be good, and have lots more tuning potential.
tabetha