Since your mechanic will have to take the front of your Ed. 30 to fit the IC, it's not that hard to do the intake cleaning. With the front out is much easier to replace the fuel pressure return valve too.
Look at mine with 57.000 km:
My mechanic and I weren't expecting that it was this bad with so few km...
It made 243 BHP with all that gunk in the valve stems...
I'd also recommend replacing all thermostats (your car has 2) and temperature sensors (I think you have 2 as well) because they're not that expensive parts, are prone to malfunction and it's the labour to replace them that can be a PITA.
DSG thermostat: 4E0121113
Engine thermostat: 06F121111H
Engine thermostat seal: 06B121119B
Temp sensor: 2x 06A919501A
Temp seal: 2x N90316802
Retention clip: 2x 32121142
Your build is awesome!