ScouterMan,
Welcome to the fire! Seems lke you are well on yor way to being prepared. As for the self defense in your state, how about one of the Listserne mouthwash sprays mentioned in another thread? Hitting a bad guy in the face with 80% alcohol should give you a few seconds to make your next move.
If you have no qualms about totally destroying a bag guy look for the small aerosol spray cans of oven cleaner. That was a secret weapon a girlfriend taught me up in New York. The trick is having it readibly available if needed and avoiding collateral damage.
-Blast