Was Ammon a type of Christ?

I have been reading in Mosiah 7 for the last week or so, and while I was reading verses 14 and 15 today, the thought hit me that in some ways Ammon, the person sent to find Limhi (or rather his grandfather and the people who followed him, was similar to Jesus.

For example, in verse 14, Limhi says that it is because of Ammon, he is now full of joy.

And now, it came to pass that after Limhi had heard the words of Ammon, he was exceedingly glad, and said: Now, I know of a surety that my brethren who were in the land of Zarahemla are yet alive. And now, I will rejoice; and on the morrow I will cause that my people shall rejoice also.
Likewise, has Jesus turned our sorrow into joy (see John 16:20).

Limhi sees Ammon, as shown in verse 15, as a deliverer for his people, who had been in bondage to the Lamanites.

For behold, we are in bondage to the Lamanites, and are taxed with a tax which is grievous to be borne. And now, behold, our brethren will deliver us out of our bondage, or out of the hands of the Lamanites, and we will be their slaves; for it is better that we be slaves to the Nephites than to pay tribute to the king of the Lamanites.

Likewise, Jesus is our deliverer. (See 1 Thes. 1: 10; 2 Ne 11:5). Not only does he deliver us from physical death and God’s wrath, but he delivers us from our own burdens (see Matt 11:28–29).