Lagos and Sagres were definitely on the radar - are they worth that extra journey even in that short a trip, though?
How would they compare with somewhere around Tavira? I realise that the actual coast is less accessible (i.e. via ferry) around here, but I remember liking the town on a previous visit.