Yes, you are right about the development of Sauron's views of himself and Morgoth over the course of the season. Next season will involve him setting himself up at Minas Tirith, somewhat apart from Morgoth.
There was a lot of talk about Galadriel and Celeborn, but ultimately they ended up not...