That is a wonderful start. It looks like you took the correct initiative and that you have had plenty of training to realize that firearms are not always the panacea lots of folk make them out to be.
That being said, what about a full contact school? I agree three hundred percent with the former post that stated in essence "if you cannot use it full force in training, it should not be in your arsenal for when things go bad". Forgive me if I misrepresented the former quote...
Have you found a school yet that allows you to punch full force to any target or kick or headbutt or elbow or knee a moving, albeit well-padded, human target?
I think that may well be your next logical step in training.