All of a sudden I made it to 51 dives without taking AOW and I've done most of what's usually covered. I do want to get the AOW certification mainly to avoid the mentioned snags when diving from a boat that requires it. I plan to do my AOW with a shop that does it 1:1 and I'm going ask them to emphasise gap coverage, cut me no slack and make sure I learn something, even it's just an alternate way of doing something I have a good method for. Look for a customizable program, we all have gaps we can close even if we have learned the skills to dive in our comfort zone.
Pete
Pete