Fair enough, least its a decent engine then! Have you taken the innards of the dash out? like the heating matrix and vents? might get you a little bit more.also headlining and interior plastics if you haven't taken them out already
I wouldnt remove the heater matrix, how will he be able to see when the windows steam up?