The mage/templar war would have to be solved for real after they got to Skyhold, if I went that route. Having a common enemy should be pretty helpful in that case.
I'm going to have to work on the what I want to shape the peace like. I'm not even sure I think the templars deserve to be restored, at least as an order. And while I do want some form of school, I wasn't a big fan of the way the circle worked. (Or didn't work)
All these things will be figured out before a new Divine is picked tho. It really bothered me that it was the Divine was the one making all these choices. This shouldn't be church business.