Since and only since you switched MAF and injectors from a TT225 to the AWP/AUQ, copy all the fueling maps over and stock MAF maps and correction maps over. Don't forget the wall film maps also. Because these are your new *stock* settings. So start from there. Put MLHFM to stock for the 225TT also.
See if the rich condition happens again. or put your hardware back to stock with stock ECU settings and see if the rich condition goes away.
Forgot to mention the MAF has to be from an '03-05 225TT because the older years didn't use a wideband MAF sensor.
edit: .but you are just using the the TT housing with stock sensor so make sure the TT 225 file you use to copy from is for '03 and up BEA or (I think) BAM engine codes. 2nd engine code is euro. anyway they use the same sensor part number but different housing part number than the AWP/AUQ or H.. the 180 hp rated 1.8t '02 and up model years.
