For AEAD, We'd most likely look at ChaCha20(Poly1305(Text)+Text) and I think that's a great idea. :)

We're definitely looking at non-NIST algorithms, we've just had enough of those.