Wherever possible add a single night car or cheap hotel and pay the minimum deposit making it a BA Holiday. This allows a cancellation and rebook down the line if the price significantly drops, only losing the small deposit paid. I do this with almost all bookings and allows greater flexibility far in advance, especially on complex itineraries where a cancellation of any flight gives you further options including free cancellation