I think that I do not uderstand it correctly -
"So, ABC's should be selected in context with the current reaction and focus points. Right? Since C is below A, a new picture had evolved and we should make our analysis with the new focus and reaction points."
It seems that you try to complicate the overall picture. Try to use a simple rule - Thrust - retracement - expansion. So, usually the beginning of thrust is an A point, the low before retracement B and the high of retracement C.
Looks like focus numbers are correct.
Sorry, I mean that while calculating DiNapoli Expansion points we should take into consideration the latest focus & reaction set we are experiencing.