Another consideration is the upwash created ahead of the airfoil.
Whilst it is true that there is up and down wash associated with an aerofoil producing lift, it isn't correct to say this alters the AOA. The aircraft has one mean chord line and one direction of relative airflow, that being in the opposite direction to its flightpath, and the angle between the two is AoA.
To suggest otherwise would be to say that different parts of the aircraft have different AoAs. They may have different flow-paths, but AoA as presented on lift and drag curves is the simple angle presented above.