I've never much liked how Quill does grouping. Doing GroupBy and then Map may be idiomatic to Scala collections but it causes odd errors because Query[Query[T]] is not a valid thing.
Maybe time for a new API?
GroupMap isn't much improvement. Maybe use map(Tuple2) first?