I find myself very much the same whenever I play RPGs, because as hard as I try to be a "Paragon", I do find myself willing to do extremely morally dubious actions to get rid of a greater evil or if it could lead to something that ultimately benefits people.
That being said, no matter how "good" the end result might be, if it requires that people suffer to achieve then my natural response is to attempt to thwart it in any way I can, since I do not believe that the ends ever justify the means in that case.
So why I guess that I'm sympathetic to Solas and his desire to save his people, it crosses far too many lines that I'd ever be comfortable with. I'd probably go with either a less harmful third option if I could find it, or instead attempt to rebuild Elvhenan and help the Elves who live in the here and now.
Solas really needs someone to slap some sense into him and remind him that despite wanting to atone for his mistakes, Elvhenan was still a morally bankrupt empire run by despots who proudly proclaimed their own Divinity, that he destroyed and locked away for a very good reason.
I pretty much agree with everything you said there except for the last part. 
I'm reminded of this banter between Solas and Dorian:
- Dorian: Solas, for what it's worth, I'm sorry.
- Dorian: The elven city of Arlathan sounds like a magical place, and for my ancestors to have destroyed it...
- Solas: Dorian... hush.
- Solas: Empires rise and fall. Arlathan was no more "innocent" than your own Tevinter in its time.
- Solas: Your nostalgia for the ancient elves, however romanticized, is pointless.
- Solas: If you wish to make amends for past transgressions, free the slaves of all races who live in Tevinter today.
- Dorian: I... don't know that I can do that.
- Solas: Then how sorry are you
This indicates, IMHO, that he has no illusions or delusions about restoring Elvhenan as it was, but lends credence to the idea that he wishes to restore the magic and "life as it was lived" before the Veil. Restoring the natural order of things, the natural state of the world, etc.