So would I come to Cuba again? Absolutely. I fell in love w Havana & pray that w the future US investment bound to eventually come, it retains its unique culture & feel. I will be back to Havana probably in the not so distant future. The rest of Cuba? I’m not so sure. I loved the other cities I visited & I’m thrilled I did so, but I’m not sure I would need to return. I don’t think I need to hit the beaches again. As pretty as the beaches are, & they easily rival / best any other Caribbean beaches I’ve seen, I think I’d skip them as they are devoid of any Cuban culture & teeming w annoying entitled tourists. I know the same people visit Havana, although most I spoke with had never, but in Havana they are far outnumbered by locals so they don’t stand out quite as much. 
It all depends on how much time I have. One week? Stick to Havana. Do some day trips in a hired taxi out to Playa del Este 20-30 mins outside of Havana for beach time & still enjoy the Havana nights. Two weeks? Squeeze in something else. A flight to Santiago de Cuba, which I was unable to squeeze in thx to Fidel, & again if necessary, find local beaches surrounding the city. But I think I’d stick to the bigger cities teeming w people, music & culture bc for me, that’s what Cuba is all about. Or consider spending a week at one of the top 2 dive locales (Jardines Del Reina & Isla de la Juventud). 
One thing I know for sure… I would think twice about flying in American-owned airlines. Other airlines have been flying in & out for years & they seemed to have no problems. I flew AeroMexico to Havana w no issues. Unfortunately I decided to fly American Airlines back from Holguin. Their computer system kept shutting down so it took them forever to checkin the passengers which resulted in a 1hr delay. 1hr of 3hr layover in Miami. Not bad. Then on the runway, we suddenly turned back toward the terminal. Not good. After sitting for 30 mins, we finally got an unbelievable update from the Captain, clearly taking cues from the new President-Elect: “I’m sure you all are as frustrated as we are. The delay is due to the total incompetence of the people on the ground here who can’t seem to understand that we need an accurate count of people & weight before we can leave & they can’t seem to get it to us. I have no idea how long it will take.” Ummm. What??? A lot of white Americans around me laughed out loud. When they were done, I said, in a rather loud judgemental tone to anyone within earshot, that I thought the statement was extremely rude, there have been planes flying in/out of Cuba for years & a Canadian airline that was due to leave 1.5hrs after us got off just fine, yet we’re supposed to believe it’s an issue w the Cubans & not an issue w American who is newly operating flights here. Yeah right. That shamed the laughers into silence as the plane was full of Cuban-Americans & I was offended on their behalf. It was total BS from an incompetent airline. And by the time we left, I had given up all hope of making my connection to Chicago. Oh well. I put on The Magnetic Fields 69 Love Songs Vol 3 & chilled out on the way back to the states.