I'd add some weapons training and self-defense for the sake of self-defense type fighting. You're probably not going to be in an open area and they're probably armed so it's good to know when you're screwed =). My taekwondo school (go ahead and hate, haters) used to have a self defense club which was a combination of formal drills, chasing each other around with rubber knives/pellet guns, and guest instructors. One instructor worked for a prison so we covered firearms. One was a state trooper and 4-degree blackbelt who had these amazing release techniques. You could grab his arm with both hands, but he'd brush your wrist and your hands would let go even though you were prepared and knew he was going to escape. I wouldn't poo-poo ground fighting, either. You could be the best at stand & bang, but if you end up on the ground and don't know what you're doing, then lights out for you! Even if its just basic jujitsu or MMA-type stuff, if you knew a little defense and could pull off a quick arm-bar, that would end a lot of fights in a hurry.
My new fighting technique is unbeatable.
I call it SHARKTOPUS!
Coincidentally I was looking to do the same thing a few months ago (street crime and muggings are on the rise here, like a lot of places) and have been attending Guided Chaos classes. The system is based around the fact that most brawls, fights, whatever are total chaos and generally over in 3-4 seconds. The style and theory make total sense to me - training from the get go to be totally flexible and not be tied to any rigid defence patterns as these aren't much use in the real world as attacks tend not to follow a prescribed pattern. After a couple of months, it's starting to come together a little so I am impressed. Clearly I am no expert in these matters but it's worth a look HOME - Survival Self-defense: Close Combat, ground, gun, tai chi fighting
Also I found Geoff Thompson's self defence book to be really good Amazon.com: Dead Or Alive: The Choice Is Yours: The Definitive Self-Protection Handbook (9780873649148): Geoff Thompson: Books