Thanks everyone. I think the best solution is going to be to reorganize the data. I was hoping not to have to, but ultimately to reduce reporting error it seems this is my best solution.

Thank you for all of your help!