first of all, I need to say that I love the relaxed execution of Matsubayashi Ryu kata(s). Sensei Nagamine was a great teacher and his letter to JKA is legendary. since you are tired of block/punch karate I would recommend that you focus on not more than 3 katas for self-defense. for example Naihanchi Sandan for the clinch and Tomari Passai for close range. I have seen Matsubayashi-Ryu simple bunkai and never been impressed with them but you can look at them like a karate-jutsu practitioner, look at people like Oyata, Kise,Masaji or Hokama and use the same principle in your bunkai and you would see the Krav maga techniques in there. I do 14 shorin-kan kata plus 12 Goju-ryu kata. I only work on Goju-Seisan to the point of using it in a real conflict that I hope never comes.