You will love the Gems of the Baltic. I did the same itinerary a few years ago, except that we went into Kalmar instead of Visby. If you decide to take one of the tours into Moscow, I recommend the one that includes the Armory. That is where all the artifacts are.