I use NAUI. I also count bottom time as from splash to surface.
My Current instructor gave us a table that had Max bottom time and Group designators for a zero RNT diver at depths' from 20-130' that had 10 different agency's tables on it.. it's pretty interesting. The Navy's tables were the second most liberal right behind NASE's 1990 tables. I'll try to scan it and post it in somewhere on the group page tonight.
I use the weight pockets for warm water diving and I have a harness with weight pockets when I use a dry suit I also have ankle weights for the dry suit diving as well. I like the Zeagle Ranger! I added a crotch strap to it.
I have a number sets of fins to include some old 'duck feet.' My favorite ones are my apollo bio-split fins with spring straps.
I love Zeagle. I've got the Tech and it's my favorite BC I've ever used. I only use 4 lbs with a 5 mil wetsuit and full gear, and I like to keep that in the trim pockets so I don't lie face down on the surface. So I haven't justified spending all that money on a weight system I would only use for dry suit diving.