I love the idea of him having a part in the Dancing Cavalier - I rather fancy him doing fencing with Don.

Indy as fight choreographer is also irresistible, because the entire point of fight choreography is to make it look good, which he is reliably going to short-circuit from his experience of actual fighting.