If it were me I'd take the 20 for large depth of field landscapes and architectural shots.
The less gear you have the better . There will be so many new things to see and photograph you don't want to spend your time fiddling with lots of gear. Spend that time composing great pics.