Here is what I can share based on the Christian faith and the Biblical text--
The word angel comes from the Hebrew Transliterated Word
"Mal'ak "and means "messenger or representative".
At the resurrection people will neither marry nor be given in marriage; they will be like the angels in heaven.
We will be like angels, but we will not be angels.
For it is written: " 'He will command his angels concerning you to guard you carefully
The duty of an angel for God's people
and they can no longer die; for they are like the angels. They are God's children, since they are children of the resurrection.
What the saints of God (all believers and followers of Christ) will be like when they leave here- like the angels- we will no longer die, and we will no longer be divided based on gender.
1 Corinthians 6:3
Do you not know that we will judge angels? How much more the things of this life!
This indicates that we are separate from the angels.
Because of the things above, i would not be able to choose between the two options as it seems not to apply to the state of a person in heaven.
This is taken from Revelation 20:11-14 and may shed some light on good and evil in the end-
The Dead Are Judged
Then I saw a great white throne and him who was seated on it. Earth and sky fled from his presence, and there was no place for them. And I saw the dead, great and small, standing before the throne, and books were opened. Another book was opened, which is the book of life. The dead were judged according to what they had done as recorded in the books. The sea gave up the dead that were in it, and death and Hades gave up the dead that were in them, and each person was judged according to what he had done. Then death and Hades were thrown into the lake of fire. The lake of fire is the second death. If anyone's name was not found written in the book of life, he was thrown into the lake of fire.
I hope this helps. it is the best I can offer.