[dao spoilers] Soldier's Peak or Vigil's Keep?

So, in Awakening, the new Grey Warden fortress is the castle of Vigil's Keep, even if the former Grey Warden fortress of Soldier's Peak was found and cleansed of its' demon infestation. In my headcanon, I used to posit that Vigil's Keep was only a stopgap until Soldier's Peak is repaired, however, given how much work a player can put into making sure Vigil's Keep is up to snuff, I wonder if it would be easier to just stay in Vigil's Keep. Thinking about it also reminded me of Adamant Fortress, which was abandoned a hundred years later than Soldier's Peak, but was still considered old enough to be susceptible to modern siege equipment.

Out of curiosity, what do people here think? As Warden-Commander of Ferelden, would you choose Vigil's Keep or Soldier's Peak as the Grey Warden's main headquarters? If so, what would be the fate of Soldier's Peak - abandoned? Demolished? Left for Avernus and the Drydens? Turned over to the Crown and/or Fergus Cousland, Amaranthine's liege lord https://mobdro.bio/ ?