especially with the push of whatsapp business, orgs can freely store ur messages to them.
also by relying on the whatsapp metadata (the one where you can export by urself), it should be already good enough for feds agent to locate u.
for the E2E itself, as non crypto guy, seems the open whisper paper implemented on whatsapp alr good enough?