The 2.0 is painless really. I'd personally go for that, and I believe you need a couple of bits from the 1.8, sump and some other small bits. Also an engine mount. It has been done so many times, you'll find what you need from looking on here for an hour.