I can agree with all of your points except for one:
I assert this means that all types are according to God's will - but not every gemstone (or Christian) participates the same way in His Light.
Hebrews 1:3 tells us that Christ is the brightness of the Father's glory. We cannot magnify the Father's glory in this way, but we can be participants in His Light. And that thrills me to no end!
Fitting point. Pondering . . .
How about:
HE WILL . . . IN HABIT US, TEMPLE IN US . . . at some point . . .
such that
HE WILL SHINE THROUGH US/BE REFLECTED IN US PERFECTLY AS HE DESIGNED IT TO BE SO.
He doesn't do things less than perfectly--whether designing us, shaping us, refining us, faceting us, polishing us . . .
HE WILL PRESENT US BLAMELESS BEFORE THE FATHER . . . and I construe that to mean His maturing of us will be perfect, too.
GIVEN THAT . . . as bride components without spot or wrinkle . . .
HIS GLORY WILL BE MANIFESTED IN AND THROUGH US FLAWLESSLY.
And in the process, our PERSONALITIES will be MORE US vs less us.