Yeah, I thought about xpubs too but like you said; it’s the accounting coordination that causes complexity. This is already fairly easy with lightning, but Bolt12 on lightning will make this a lot easier.