If i were you i would go for the 16v. More power for your money and they are better to tune in my opinion. But the best thing I ever did with it was go to a 2L. Its up to you.
If you were to go to carbs it would release more power too, once their set up, and the fuel econemy isn't bad if you don't thrash it everywhere.