Hi Tony,
This sounds crazy, but I went to the KN 6000, World, Scottish Reel, up the tempo to about 170 and you get a pretty good, Havana.
Not cigar, but dance.
It has the basic rhythm, but you'll have to change some instruments from the music style arranger to panel memores. Hope this is of some help.
Best Regards,
Dave