Hmmmm I just noticed you have a n/t. As far as I know they don't usually suffer from the major idle woes of the tsi's. My primary guess would still be a dirty TB. If you have an egr block off plate I don't see any reason not to throw it on when you clean the TB. At least you can eliminate that as the problem.