Joel,
If you can get acess to a VAGCOM, there is free software that can modify (%) wise, injectors, maf, etc. I think its downloadable from ATP or ECS, maybe GIAC? It's weird as shit, but there if you want to go that route.
I stil have a 2.0 woorkhorse, and I can barrow my buddys 1.8t if you need anything, have the shop manuals for both.
How was EFI101?