I'm 120% agree with Holemaster..
For me keep diving doesn't matter even at 20mtr, as long keep the same rig all the times, if you're wearing double, use them well.. do a lots of drill and skill. I'm still newbies, so practice it's my key right now.
Safe Diving
Zaha