I think you are good with the first iteration of your model, and you could probably go with the first solution or with the facets solution. We hope to get loops within query that would help us do this without facets.
Other than this, feel free to raise questions as you go ahead.