Charles,
You'll like Clive I think. He's very mellow, lets you do your thing, or you can follow the leader. He doesn't restrict your bottom time, but says something like, "This dive is to 70 feet, so your NDL is 35 minutes or to the limit of your computer." He shows you where the wreck is...