Stay at the Old Jailer's Inn in Bardstown. It really was the old jail and the rooms are quite nice. If it was warmer, they also have a very nice back courtyard for guests.
It is quite easy to do both Heaven Hill and Makers in one day. Heaven Hill is mostly a film and warehouse tour ending with a tasting, where as Makers Mark has their tour pretty well down pat so it is also pretty quick. If you start early you can even go to the Oscar Getz museum before the tours. The Getz is a must see stop on the trail.
"Our people live almost exclusively on whiskey" - E H Taylor, Jr. 25 April 1873