Audi 2.0 litre coupe Motor upgrade/repair help

[Sharkiegtr]

I have an Audi 2.0 litre coupe. She has the AAD code motor. I want to upgrade the motor to a later 2 litre motor and was hoping someone could help with some advice.
1. I am hoping to keep the gearbox
2. A later model motor (less mileage & better overall performance)
3. Do I need to change any electronics?
4. Do I just refresh my motor, new bearings/Rings etc.
5. What possibilities are there to gasflow the head and and install a better camshaft & valves?
She is my daily driver, which I also want to play at some of tracks on the North Island with. Thanks Heaps for any advice

[00quattro00]

Pm johnp, he has a complete 2.0l 16v that I sold him that came from a coupe I wrecked, It would be the easiest option and they make a lot more power than the 8v