... but still a company that you have to "trust". I'd rather have a protocol that will allow me to not trust anyone and still be secure/private by default.
Then use neither. No protocol allows you to not trust the implementor, and WhatsApp has shown signs of accessing keys.