Thanks for all the replies.
Time to make some calls. I'll probably try Tres Pelicanos first as I think I know a DM that works for them now. Do you know if Tres Pelicano's does a surface interval on the beach? And if they ever run any afternoon dives...heck maybe an afternoon up North by request? I haven't dove up north in about 10 years.
Re: Same hotels. Everyone has their preferred hotels. I'm hooked on the Casa Mexicana (breakfast, beds, location). The couple (with the one diver) really likes the Hotel Cozumel (hot tub, pool, waterfront). Rather than force them to stay with the others, I figured some of the cool dive shops would be able to help us out. They will probably join us for dinner several nights...but not every night and they don't mind the walk or might walk there and cab back. All pretty laid back if you ask us.