Me myself I would go for kickboxing if I was you I don't know whether it is just my class but it encompasses a lot of different scenarios and techniques to get you through most things, like in my class we practice suprise attacks, being attacked when you're not prepared, grapples, weapons etc..., seems to focus more on real life situations like brawls, back-to-back, bars etc...
Also quite a lot of sparring is involved so it helps you practice fighting with other people, I find my kickboxing class pretty fun, it isn't too formal but we still have a certain level of discipline, everyone is friendly and helps each other and I come home feeling good even when I have bruises
