1.8TFSI CDAA engine replacement

[Aumeisters]

Hello.

So my Yeti 4x4 1.8tfsi CDAA engine has reached point it's eating far too much oil, so trying to figure out what would be best different engine to swap it out to so I never have to worry about it. CJSB seems to be 4x4 gen3 of same engine but just want to confirm if it will be suitable replacement or better getting different engine which would be straight swap out? Only reason I'm not doing recon on existing engine is that it already had slight knocking and suspect one of followers are knocking when idling too. 

Has anyone done swap and if yes to what engine and do I need only engine or all ecu, bcm, etc? 

 

Thanks in advance. 

[superjase14]

I’m also looking for any advice on the same issue please.