I believe the consensus Christian view is that the angel was indeed a theophany, a preincarnate appearance of Jesus Himself.
Thanks, Dan.