We ended up staying at the Decanter Hotel. Highly recommend it. Location is near El Convento. https://www.decanterhotel.com/
We also did a walking food tour of Old San Juan with Angel - he was a great guide and we were stuffed after the tour. About a 3 mile walk in all. http://sanjuanfoodtours.com/