One night in Faro area

We are booked at the Tivoli Carvoiero for 7 nights in June. I messed up my dates and we have one more night to book. I can't get the same rate at Tivoli. We are leaving from Faro airport. Any suggestions on a one night stay for our last night in Algarve? Maybe Tavira?? I tentatively booked Pousada in Estoi for the last night to be a bit closer to the airport, but am not sure that is the best choice. We have a morning flight.