Hi: Just read your post and wanted to make sure you know there is a recent book, Hemingway's Boat, by Paul Hendrickson. If you are at all interested in his time in Cuba and his life and his boat, this is a quite wonderful book.
Also, just FYI, there's a branch of La B del M in Puerto Vallarta, where I've enjoyed more than a few mojitos, and some terrific music. And yes, the Havana Club rum is awesome!