All of your concerns die away in a hybrid enviroment.
And I disagree with your "tap on the shoulder" problem. That is easily resolved with a one line email/message which can be answered equally quickly with a one line answer without all the social BS ... if it needs more than that then it is interfering with productivity at that moment and a short or appropriate meeting can be scheduled to elaborate. Anything else and ... sorry, you don't value good work.
And I disagree with your "tap on the shoulder" problem. That is easily resolved with a one line email/message which can be answered equally quickly with a one line answer without all the social BS ... if it needs more than that then it is interfering with productivity at that moment and a short or appropriate meeting can be scheduled to elaborate. Anything else and ... sorry, you don't value good work.