I am going for the best overall Cuban experience I can get so trust that you will set up something that is amazing and helps the Cuban people and therefore which city or how we do that is less important to me. Having selected that response, I will add that I have been to Cuba before so will defer to everyone else in terms of itinerary. Additionally, I have flexibility in terms of a land experience either before or after the dive - I am good either way.
Thank you for your insightful input and helpful. Cheers and welcome to SingleDivers.com! I see this will be your first trip with us! YAY!!!