If I were doing it myself I would yank the motor/trans and check the RMS. If it were fine then I'd yank the heads.
Either job can be done with the motor in the car but it's a total pita to take the heads off with the engine in the car. If you don't know which to pull, you're better off just yanking the motor.
If I were you I'd just try to milk AoA for whatever you can and work from there. Man, warranty... so far from my mind with my S4.
2002 S4 Avant, 6spd. Bone stock.


Caveat: Any advice I express regarding potential tuning and such is purely informational. If your knowledge and abilities are not up to the task, no amount of advice can assist.