F&T:
I've decided to play the waiting game myself, so I probably will be doing the Club Amigo/Havana trip in the end.
The First Choice flight dates of Nov 2nd and 16th to the PCV are not ideal to fit in with you, whereas the Nov 9th flight for the Club Amigo for 10 days seems more convenient, flying onto Havana at 1830 on 19th November fot three nights.
The November 12th date, which would be more suitable, gives me 13 nights at Club Amigo and 3 nights in Havana, but I'm not sure if I can do a 10 day Amigo + 3 day Havana on this booking.
Early days still yet, but the options are there.