Have you heard of the Data Vault architecture? It sounds like it may help with your scenario.
This video discusses it:
FYI I've seen Leslie and Jeff present on Data Vault but I haven't watched this particular video yet.