Did I tell you, or did I tell you 
Wise man you are. I bet you gave yourself a BIG slap on the back.
Definitely sounds like the procedure we had to go through this summer,
since we had to change that mass air flow sensor as well with the ETM.
Luckily you didn't have to install a new gerbox. Although, we can now
relax with the issue, since this new gearbox should be the updated,
highly improved version...
Did you notice any positive change regarding the gas mileage? We had a
significant improvement with ours - around 2 liters less per 100 kms.
Same here 
) Have a fantastic week!
