If you want a stand-up grappling martial art that hasn't lost most of its martial roots, just go with Judo (or one of the various wrestling variants).