Yeah the real answer here is that this is what AEADs are for.