Thanks everyone. I just got back from my trip. I ended up upgrading the firmware, because I didn't want to miss more shots that were time-dependent. Upgrade went well and it seems to have fully resolved the problem. Occasionally the camera will refuse to focus, and power cycling will help fix it.