Although I'm a huge fan of Pavelski and he's great in your league, I think you are correct in saying that his stock will drop in the next few years. I love the idea of keeping two goalies. You'll have a huge advantage to start the season and can always use one as trade bait if you feel your forwards are struggling.
None of Toews, ROR, or Dubinksy are better than your correct choices for keepers.