Dear Ernest,
I was there some time ago--2004--so some things will have likely changed. +1 on the beaches in Veradero; they are excellent, but are in the next province over from Havana (Matanzas). In Havana, the "old Havana" part of the city is the nicest/most geared toward tourists. The Hotel International is there, open air markets, bars, etc. In Vedado, the other side of town, there are a couple hotels like the Riviera (of Meyer Lansky fame) and the Melia Cohiba hotel--the latter of the two had an awesome walk-in humidor.
The museums and plaza mentioned are worth checking out, though be prepared for some relatively harsh anti-American sentiment. Many homes are licensed to open up their front yards and outer rooms to serve food... which was always excellent, and very moderately priced. Grab some 7 year old dark Havana Club rum and a Cohiba Siglo VI, and enjoy hanging by the wall that overlooks the sea! And if you have extra Rum and smokes, drop me a line--I'm just up the 110 from you in South Pasadena!
Have a great trip.
BTW, the Outlaw is my absolute favorite knife... it is always with me.