Have you ever tried running a query letter through Query Letter Hell at the Absolute Write Water Cooler forums? It's an excellent way to refine a query. (You do have to have fifty posts to be able to do so, but it's easy to get that many just by participating in some of the nonsense/fun threads.)