I think Champion would work better because Indy doesn't use melee weapons which Battle Master abilities require melee weapon attacks, and it help out his combat and athleticism.
For Expertise: take History, Athletics, Acrobatics, and Investigation
For Fighting Style: take unarmed fighting...