The best practice is to avoid situations where you would need a firearm to protect yourself. Have the proper attitude and don't try to be the law enforcement. Attitude has the potential to defuse or escalate a situation.
It is highly unlikely that you will NEED to protect yourself by shooting at someone 25 yards away. The court system is likely to make an example of people who do this.
Work on quick shots at 5 to 30 feet and everywhere in between. Work on controlling the recoil properly so you can do quick, accurate shots.
Work on drawing and reholstering with an unloaded firearm. Be sure you never sweep any part of your body or anything else you do not want to shoot. Make sure your finger is not on the trigger unless the firearm is on target.
Work on reloading doing magazine changes for a semi-auto and speed loaders for a revolver.
Practice how you would handle potential malfunctions (stovepipe, double feed, failure to feed, failure to eject, failure to fire).
Continue your training. See if there are any classes where they actually have a shoot house as part of the course.