I'm doing pretty much the same procedure with my digifant 2 litre
conversion.  You will find this article interesting from Autospeed
magazine:

http://my.tbaytel.net/guskers/AutoSpeed.htm

The vehicle in question was a bmw with air vane type AFM.  The procedure
used for tuning was in many ways identical to what you did to recalibrate
your AFM.  At some point in the near future I'll be purchasing a wide
ratio meter (they start at about 300 for models that log data) to fine
tune my setup.