Another benefit of Suites Bahia is that it includes the breakfast buffet at Casa Mexicana. They start serving at 7, but fruit and coffee are usually out by 10 til. You would have about a 2 block walk for breakfast, but the buffet is really good. They change it up daily, but there are always the standards. We usually grab a few bananas, pears, or other fruits for our surface interval too.
One of our favorite bars/restaurants, The Thirsty Cougar, is across the street from SB. Christian and Abraham will treat you like your family. The best coffee shop ever is behind it, and Lobster Shack is on the same block as well for lobster rolls. I go to dive......but you gotta eat too!
If you dive with TP, or anyone else for that matter, make sure that the departure point and time works for you. Some pick up by boat downtown, some pick up at your hotel, some leave from their shop, and some require you to take a cab to the marina South of Town.
Blue Magic, Blue XTSea, and I think Dive With Martin all have Sleep And dive packages as well. Aldora uses steel 120 tanks for looooong dives and leaves from their downtown dock (very close to The Thirsty Cougar...how convenient)
Good luck, safe travels,
Jay