I have run into the same issues. I am just saving files by their hash. They contain no metadata. The signature/decryption key are sent separately. This allows securely saving data anywhere without leaking any information about content or ownership.
It also allows the recipient to make the choice of whether to download or not.
But I am not really sure we need PQ cryptography. The best attacks would still take millions of years.