My 1.6 NA engine just got a rebuilt head and new head gasket. I finally got it running again yesterday and the oil and water are mixing and blowing steam out of the valve cover...This engine has had a lot of issues in the past as well and I'm thinking its time for an upgrade. I'd like to keep the simplicity of the mechanical injection. Does anyone have any advice on swapping to a 1.9 NA vs. an mTDI engine? I'd like to keep the same transmission if I can. Power is not an issue for me, just trying to keep the swap simple and relatively cheap ($1-$3k if possible). I also don't want to do this again for a long time so I'm wondering if stepping up to the mTDI would be worth it in the long run.