If you go to Montreal make sure you look through the shows and events that are happening during your visit, there's always something happening. Vieux-Québec is a must! You might be able to go whale watching around Québec City depending on when you go.
If you want to try Québécois food don't go to the tourist traps, the lowkey mom & pop places are usually much much better.
Please learn a little French too!