>people should be able to sort themselves into teams that suit their preferences.
The teams are going to be companies, in my opinion. There are going to be 'remote' companies and 'in person' companies. That's the only way this type of self-sorting will work, people won't join a company not knowing for sure whether they're committing to an in-person or remote working experience.