Not to forget Siddharta Gautama himself, who as a prince was taught martial arts from a young age. And perhaps the best example; Arjuna in the Mahabharata.
Though I do wonder if siddharta fit the criteria above. Did he continue to train in martial skills until he died?
I intentionally left Arjuna out because in an earlier post, when I mentioned him, I felt some folks doubted he was an historical figure. I believe he was. But I cannot prove it.
Mohammed and Salahudin would be great additions to my earlier list of candidates.