If we have a DWITHIN operator, doesn't that set the geometry?  (... or at least give us a geometry to intersect with any previously defined query polygon?)  In which case, can't we remove the DWITHIN from the filter?  The more we can trim down the filter, the better we might be.