try adding atemi into judo.. a judo teacher worth his weight will be able to show you strikes in judo.

I want to echo the thoughts about 'goshinjutsu'. It's basically no-nonsense Japanese martial arts. Any martial art like aikido, judo or jujutsu may have goshinjutsu in it.

It's usually very good stuff.

The best way to deal with weapons is to have one yourself at all times.

What I would recommend is a combination of military combatives (the old version, along with atleast some basic ground fighting) and aiki-jujitsu. aiki-jujitsu seems to be pretty solid on a combination of things and military combatives is simple, effective and brutal (however, it's not good for every situation, that's why I recommend aiki-jujitsu) You can research military combatives by reading FM 21-150 (the 1971 version) just remember that some of it you probably won't use in real life (ex. sentry removal) and keep in mind the brutality of it, thus it probably should only be used in lifethreatening situations. Also, I would recommend knowing atleast the basic positions of ground fighting (can be found in FM 3-25-150). However, I consider the more advanced stuff not as neccessary in a street situation for these reasons. You should try to avoid the ground (the bad guy will probably fight dirty or he might have friends to stomp on you)(there could be dangerous objects on the ground ex. broken glass)(and if you do get taken to the ground, instead of "skirting the shrimp", you could do a simpler thing and fight dirty (ex. bite em), besides, if you're in a street situation, it's probably worth it to fight dirty, since the other guy will)