This is how you lure in Indy, you have it so he and Marion have divorced and Karen Allen doesn't have to show me her Eddie Murphy School of Dental Work all movie long, Mutt gets in trouble, and you have Indy have to come save him. That keeps him out of most of the movie too.
Add Sofia Hapgood to the mix, She is perfect for Indy, and you could make her younger, like 40, and have Mutt like her as well, so you play it up like the Elsa relationship with Indy and his father in LC only reversed on Indy since he's the old man now.
Thats the only way to play up a suave spy angle. Otherwise he's a married bumbling geriatric. Indy was never that suave, he "makes it up as he goes" gets in over his head, and finds some insane way out at the last second.
And enough with the US goverment, use the british, he served in the british army after all.