Just go 2.0 mate your going to expend all the effort of an engine swap 2.0 will be no more hassle than a 1.8 would especially since you can get one already set up to drop into your car.