If you are located in NYS, especially the Capital District area, I would highly recommend Mike Rayburn's classes for both law enforcement and civilians. Officer Rayburn's Advanced Defensive Handgun Class covers all the important components of handgun self defense. Previously given to LE only, Mike has opened it up to people with advanced handgun experience (not an entry level course).
Mike focusses on point-shooting, since most self-defense scenarios are up-close. His courses are very reasonably priced and his credentials are outstanding. He is probably the best kept secret in terms of training in this region. If interested, check out his website and contact him.