Well, if C2 could set some time off to help you out, you are not far away from beeing where im right now.
We have the same car, so everything should be bolt on. The C2 ECU/Software is amazing. Several Japan and Audi tuners are amazed by how good driveability and "stock" feeling that I have.
Just keep on call/Email C2 and I know the company will help you out.
They have been awesome to me