stunt a4

Hey there. I own a 1999 a4 and I have just about every engine mod available be sides a new intake and ballancing and blueprinting the motor(ko4 turbo,forged diverter valve,hiflow cat, super sprint exhaust from cat back,custom nuespeed chip,front mount intercooler, k&n intake) The mileage is getting up there ( around 170k) so I would like to rebuild it to keep it a strong daily driver when it hits 200k. My plan is to mate the 1.8 head to a 2.0l bottomend. I live in the city and I love my car, I just don't love the lack of getup and go from a stop. I think the 2.ol bottomend will solve my problem, but I have a tiptronic. I have to much $ in this car to sell it and start over with a standard so I will make do. My question is, has anyone out there yet done this and if so how did the tip tranny hold up?