Can you add an extra attribute to a Device/Trigger/Schedule/Action Group/Control Page ?
Then add a category - Zone/Room so you have Dev/Trigger/Schedule/Action Group/Control Page/Zone/Room.
This would allow everyone to group on functionality and location.
I have Device Groups for each room/zone but also have devices etc that are in the Heating group/Sensor/AV/Christmas group etc etc
It would be helpful to be able to see all elements relating to a specific location grouped together and then keep everything in its function group also.
Maybe asking too much