In my implementation I am encrypting and obfuscating absolutely everything, including the ādā tags. I also might implement zaps differently, when I get there. Right now I am focused on building a component that can drop into any Lightning address provider, so they can take care of the zaps there. Much to do!