If you're going to change to the celica Maf, hold off on changing the O2 sensor. Install that MAF, reset the ecu, drive for a few days and see if you still throw the cel.
if your car isn't california emission then it should not have an egr, thats weird. you can see if you have one, it is under...