Your list of main gear sounds appropriate. Don’t get the extra lenses.
I went to Cuba (2012) and it was a once in a lifetime trip. I’m from Perth, Australia. It is on the list of “I must definately go again.”
I was armed with my very first DSLR (550D/Rebel T2i).
There was a massive downpour when we visited Trinidad. It was wrapped in a camera rain-coat, the camera was always either in my jacket or under an umbrella. AND it still DIED.
I spent the rest of the trip capturing the trip with a G12.
My tip bring a weather proof camera and gear.
Before the downpour, I was taking photos on the Obispo (Old Havana) with an EF-S 55-200. I was getting a lot of filthy looks from some locals.
They are not used to tourists but understand that it is key to grow their economy. I would cover the white L with something less conspicuous. ie Lenscoat etc
Vinales is amazing. Especially the view from the Tour place at the top, as you drive in. As a personal choice, I would stitch together a massive scenic shot, then carry a fish-eye.
Tip 2: It is a less-developed country. So the lights aren’t as bright or as many. Quicker lenses are definately a must.
There are so many old buildings in Havana. The interiors are amazing. Paint peeling, Old decor. Wide Fast lenses are needed.
Tip 3: get an amazing camera back pack. There’s a lot of walking and camera gear weighs a ton.
Tip 4: more lenses does not mean better shots. more lenses, more weight and the pain of carrying it around. I mean actual pain from carrying heavy things.
Non-photography related tips:
There is almost no internet. Unless you are staying in a top hotel.
Tip 5: Express great happiness if you are staying with someone, who has internet and offers you use of it. It is stolen and they could get into great trouble for having it.
I can’t speak Spanish, so it was hard to explain to this Cuban 16 year old that the ipad, her mother was going to smuggle in for her, would not be able to do all the amazing things she saw on the Big Bang Theory, which she downloaded at 32Kbps.
Oh, how far we have come… Grass grows quicker, than opening the hotmail gateway at 32Kbps. And that was just the front page.
Tip 6: do not go to Cuba if you are a vegetarian. My vege cousin when a month before me and spent 2 weeks eating black rice and beans.
Tip 7: We stayed with locals. Even though I can afford 5 star, in Cuba, staying with locals is a great way to go.
Cubans are amazingly nice.
In Trinidad, our party was split up in to two local accommodations. The two places, who were related, had a cook-off and we had to decide which one was better. It was amazing food.
Tip 8: They have different sensibilities. We watched, our driver, peel a mango, whilst driving down the freeway with his knees.
Tip 9: locals in Havana are really nice, until you say No thanks I don’t want to buy your black market cigars.
Have Fun.