Yes, while I am not much into looking to the Greek, this is one of those rare instances where knowing that there are different Greek words going on here helps to see what is actually going on more clearly in the text. It appears that my proposed definitions aligns with the context of these verses, as well. Granted, we do look through a glass darkly and the only way to know for sure is when we face the Lord one day.
I hope that what I said helps and blesses you.
Grace, peace, and love to you in the name of Jesus today.
May we always stay strong in Him and His Word.
