Was Mary Saved?

A Protestant friend of mine related his struggle with the
Catholic view of Mary's sinlessless, because Mary herself expressed
that she needed a Savior, in Luke 1:46-47, when she proclaimed at
the start of the Magnificat, My soul magnifies the Lord, and my
spirit rejoices in God my Savior. I think that there's a simple
response to this, which we find in Psalm 30:3, in which David
proclaims, You, LORD, brought me up from the realm of the dead; You
spared me from going down to the pit. In that verse, David
describes two different forms of salvation: God saves him from the
realm of the dead by taking him out once he's already in there. But
He saved him from the pit by preventing him from going in the first
place.