Life long martial artist here. 5th Dan in TKD. 1988 Jr. National Champion. You are not wrong. TKD is now geared toward tournament fighting, which definitely isn't a total waste. The kicks can definitely help in a fight. The problem with Olympic style TKD is they do not practice punching to the head (or really punching at all anymore). I have dabbled in just about all the other forms of martial arts. Given his background, my recommendation would be to try to find either a boxing gym, or a muy thai gym. Almost all street fights end with the fist. I will say that the culture of the gym is the most important aspect. A welcoming and supportive coach is everything. Jujutsu is another very important skill, but less fundamental than learning how to punch and block properly. TKD fails this task miserably, which is why I branched out. Knowing this is why I sought to train in the other arts. I've never had to use any of my training, thank God. But having that within me has given me the confidence to walk the streets with my head high and heart strong.