So it seems it is actually possible to have both floors/area grouping AND upstream devices. That is only possible when you show the sankey graph on a custom dashboard though, not the build in energy one.
Since I have a custom dashboard, I tried this out and I was able to get them to show up as you wanted, by manually forcing the grouping on area/floor as well (using the YAML code in the other post)