If I understand everything correctly, then yes I think the best way to achieve is using two tables. That's because the two datasets are at different grains.

If you want to use one table, it may require a lot of t-sql jiu-jitsu. Personally, I would try using two tables first. If you can't get it to look good, then maybe go for Plan B.