I think you can just remove the query out of the relay. Basically no one can query. It's a "relay" that only receives "EVENT'" commands and sends to the Push system. Super simple.

On the E2E, just giftwrap them without destination (the destination is the device ID, not the pubkey). Super easy.