Signal is probably the best replacement for WhatsApp because is verifiably End 2 End Encrypted.
So even if the Signal Foundation or Amazon where their servers are hosted decide it's time to do social graphs, at least the content of your messages is encrypted.
To escape metadata surveillance it gets more complicated, but it would probably involve a mix of TOR and XMPP or something.