You said we will be like the angels, but bro, i would submit to you that angels are not immaterial. Proof? Sodom and Gomorrah. Those angels had a body.
More proof: Our bodies will be similar to Jesus' resurrection body, He was the first of many brethren, and AFTER the resurrection Jesus drank, ate and said TOUCH ME for a SPIRIT hath not flesh and bones as you see me have.
Jesus appeared several times after His resurrection and kept changing His form.
Mark 16: 12, "After that, He appeared in
another form to two of them as they walked and went into the country.
Luke 24: 13-16, " Now behold, two of them were traveling that same day to a village called Emmaus, which was seven miles from Jerusalem. 14 And they talked together of all these things which had happened. 15 So it was, while they conversed and reasoned, that Jesus Himself drew near and went with them. 16
But their eyes were restrained, so that they did not know Him.
John 20: 14-15 (Mary at the tomb), "Now when she had said this,
she turned around and saw Jesus standing there, and did not know that it was Jesus. 15 Jesus said to her, “Woman, why are you weeping? Whom are you seeking?”
She, supposing Him to be the gardener, said to Him, “Sir, if You have carried Him away, tell me where You have laid Him, and I will take Him away.”
John 21: 12, " Jesus said to them, “Come
and eat breakfast.”
Yet none of the disciples dared ask Him, “Who are You?”—knowing that it was the Lord."
Jesus looked different multiple times when He resurrected. He could make Himself appear however He wanted to. In the room with doubting Thomas He did appear in His pre-death appearance. The other instances, you can see from the Scritpures, He did not.
Angels, just like God, are spirits. Ministering spirits. They can take on bodies. I don't know what our resurrection body is like because I have never had one but I know it isn't like this one.