Nice suggestions, but I still say we don't need the gunpowder floating through the air at all. Cut after Indy asks for a compass to them walking through the warehouse to Indy asking for shotgun shells. THe gunpowder is dumb and more needless CG.
Are you doing these edits yourself?