Hon, I've been to Cuba. The beaches off Veradero are magnificent. However, I found the food to be well . . ick.
Have you checked any AI's on the Mayan Riviera, near Playa del Carmen and/or Tulum? I think you would quite enjoy that area.
Should be able to get a charter type package or last minute deal out of TO.