We are adding 3 days in Porto pre-trip and 3 days in Lisbon post trip. I want to go to Douro valley for the day on a small group tour. Wondering if anyone else has done this, who they used and would they recommend the company? Also for Lisbon we will go to Jeronimos Monastery as I believe not included on the trip and a Fado dinner show. Any recommendations for the Fado show and other towns near Lisbon we should visit? Thanks!