Why not another Audi 2 litre engine? I suppose you could change it for the 3.2 litre if you also swap the transmission, suspension, wheels, and brakes to suit, but then might as well have bought a 3.2 in the first place.
As for the transmission, if you are satisfied with the manual gearbox, keep it. I don't understand why you would ask the question.