Thank you for that entire post. It is an excellent exhortation!
It makes so much sense to take each occurrence of "Israel" and see if it best fits with "national Israel" or "spiritual Israel."
There'll be disagreements based on the facts of each case, but we'll do away with this broad lumping of Israel into one basket or the other.