You're gonna love this trip! Just returned last week and had the same situation, my husband is certified and I completed my open water dives down there. He came along and dove with us, the first 2 dives are shallow (30') you do a couple of skills then got to enjoy the rest of the dive with hubby. The next day the dives are 60', same thing, a skill or two and I got to buddy up with my husband. It was great and also comforting to know he was close by at all times. Just a thought.
Good luck and have a wonderful time!