Just got off the Joy yesterday, which sailed the Canada portion of your itinerary (and ended in NYC). Looking forward to your report and reliving my journey. I'm not a cruiser but I needed a much more relaxed vacation than usual - this fit the bill and I was able to rest and pamper myself. The Thermal Spa pass was worth it, especially when I used credit card points to pay for it.
Enjoy Quebec City, it's very cute. Just be aware some parts are quite hilly and steep-ish. Since it was my third time, I just walked the Upper and Lower Town looking for Mr. Pink, an art installation.