You may wnt to try to have your wife do her Discover Scuba at Carib Inn in Bonaire. Bruce and his staff are as good as any we have been with. The resort is small and laid back. There is no bar or restaurant on site, but Divi is just the next property over and they have everything. Most of the people staying at Carib are repeat customers and he is often booked solid. He has only a few rooms, but his service and hospitality is the best.
We have stayed there four times and not been disappointed. We usually try to arrange our flights first usually looking for low fairs and then book what we can. We try to fly Miami to Curacao and then take Divi air over to Bonaire. American wants to route you through San Juan when you fly from northern cities and the flight times are much longer and the departure time on the last day is way too early for someone on vacation. So try to look into American from Miami to Curacao. Rather than travel through Puerto Rico we prefer overnighting in Miami and an evening in South Beach to a five or six hour layover each way in San Juan airport.
Buddy's is nice, as is Belmar Apartments, and Habitat. We prefer Carib in to any of them.