I would recommend to you to start from the beginning and adding the tables one by one. Following the conversation in this thread, you don't really understand the data model in my opinion. This is not your fault, however, in order to display accurate visualizations and aggregations, as well as extending the model with enhanced data, this will only work if you truly understand what's going on and why things are connected the way they are. Hence, you should start from the beginning one by one rebuilding the current model and in my opinion it should not take long. If you don't, you might end up creating a patched elephant which will be uncontrollable and do whatever it wants.