An hour was enough to get a new version of the query done. I've posted it up on AW and have already gotten some great feedback. I made it a deliberately stripped-down version, so I have space to spend a few words clarifying the things that are still confusing. But I think it's close!
Tomorrow I'm going to get started on the dreaded synopsis. Cue the ominous organ music.