Keep your 1.8 and just do some work to it.
It's got more displacement and consequently a bit more torque.
You can make it do everything and more, that the 1.6 can.

Plus, it runs good so why throw something away that's working fine.

Decide if you wanna go NA or FI and start building that 1.8 accordingly.
Those are my 0.02