The coastline region both North and South of Lisbon seems like it has a lot to offer. You've likely been to Cascais and Sintra?

Sintra is just great (speaking as a fan of castles) since they have the Moorish Castle and a few other castle\palace locations with great views.