Yes the 1.8 16v bottom end would be the best choice. Bored to 1.9 they are better than the 2.0 if you are building a normal aspiration motor - they rev better mainly. The 2.0 head is best to use to modify if the machinist has little experience as there is more material to work with. All the heads produce very similar results if they are well modified, though.