So the same thing I do minus the MAF adjustment.
Other things for what they're worth - I've found the airmass and map side of the torque models need to match as closely as possible - at least for a very good controlled idle and drivability. I find shifting the models off of current airmass and map readings works really good to keep the model around stock then tweaking it from there for startup and control. If you're dealing with an auto and idling at negative torque you can wind up with clutch slippage going off idle, especially for reverse so it's key to adjust idle torque to where it's slightly above or around 0 if that low of a torque is necessary. Density table dial in is a must to keep torque and fueling balanced or rather the same at all times. I've had some interesting looking density tables, but they fixed a lot of problems - even with stock injectors being involved. Still don't have it to 100%, but I have the best resulting method pretty much figured out as I've got logs where the averaged fuel correction for PE or regular fuel trims don't change more than 1% from 0 error no matter the outside or engine temp - pretty happy with that...
So use the really negative torque model and a skewed maf setting to get timing back then readjust from there.