As said I really wouldn't bother, you will gain next to nothing for your outlay and even with cam etc I doubt if your make the power of a 1.6 even, if wanting to go faster I would go for another engine such as the said 2L.

Martin