Oh gross dude she's got three variations of her theme, the two you wrote about and also The Sword of Doubt, which is the one that plays when you fight her.

But, yes! It is a great group of themes. I also agree with Sam above that Freya's theme (and variations) are awesome. A Face Unforgotten is my favourite track from 9.