Hmm, after looking at the save I saw a couple of things.
1. I think we should keep pressing on Hatty. Rifles aren't a "brick wall" at all. ;) Even a fresh 4 xp Combat1/Pinch gren has >70% odds against her CD2 rifle, and our CR rifles have 97% odds.
Thebes, Heliopolis, and the holy city...