I tried this on my actual environment, and using grouping sets did yield identical results as I had before, but performance was slower than 2 separate group by queries with...

That looks great.

I will try this concept on my real query and let you know how it goes.

Thanks! 🙂