Aikido would be my choice. I was only taught about 3 moves and they helped through 30 years of police work.
Find yourself a skilled Krav Maga instructor. Not the "fitness instructor" type that went trough a 3 days seminar.
Yes, Thor top bloke, we will train with him again once the time permits in our busy schedule.